Skip to content

chore: sync upstream v2026.4.21#57

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

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

Conversation

@github-actions
Copy link
Copy Markdown

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

Status: merge conflicts — manual resolution required

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

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

Conflicted files

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

Upstream changes (11052 commits)

f788c88b4c docs: update 2026.4.21 release notes
33f55917b2 fix(browser): reject ax<N> refs in act path instead of timing out (#69924)
ae4449bd42 fix(slack): preserve thread aliases in runtime outbound sends (#62947)
995febb7b1 fix: require owner identity for owner-enforced commands (#69774)
fd2c9dfaef fix: adapt doctor runtime dep backport
6584716054 docs: keep 2026.4.21 notes scoped
f64c45ae49 docs: update 2026.4.21 backport notes
7ddc11a387 fix(image-generation): log provider fallback failures
c18933ebfb fix: backport release install repairs
4bcfbef717 feat(openai): default images to gpt-image-2
9b32ec9ff7 chore: start 2026.4.21 development
115f05d595 chore: prepare 2026.4.20 release
4e25479cb2 test: stabilize stale-pid ancestor override
52d0a22d62 fix(tui): arm streaming watchdog on every delta, not only visible ones (#69338)
9040cda408 fix(codex): exclude codex-app-server synthetic apiKey from secrets audit (#69581)
815c2e3052 fix(media): parse lowercase media directives
79840c9fdf fix(media): preserve outbound attachment filenames
542086ccea test: accept codex not-approved fallback
1e9627f92d test: generalize codex rejected-permission fallback
26b359bebd test: accept codex elevated execution fallback
8eac996344 test: accept codex sandbox approval fallback
3243c14547 fix: lazy-load discord carbon runtime for npm install
ddd05f4e89 fix: guard empty docker host args in install smoke
bfde3c98a4 test: accept guarded memory fallback phrasing
835de92b7a test: relax active memory qa debug status
2020e63bd2 test: harden repo contract qa scenario
b835337cd6 test: filter live qa scenario lanes
7e4a5f8a6e test: accept xhigh thinking remap in qa
8b3ddb28cd test: accept explicit newer memory ranking context
ca245b8621 test: relax live active memory qa waits

Resolution

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

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