Skip to content

chore: sync upstream v2026.4.14#55

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

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

Conversation

@github-actions
Copy link
Copy Markdown

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

Status: merge conflicts — manual resolution required

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

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

Conflicted files

  • docs/cli/index.md
  • docs/providers/index.md
  • docs/providers/models.md
  • 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 (9121 commits)

323493fa1b test: refresh release verification baselines
64d237dd02 build: refresh a2ui bundle hash
62f9cf53c9 chore: prepare 2026.4.14 release
d2240a9476 test: harden qa-lab concurrent web scenarios
10dbb21380 fix(models): normalize google-vertex flash-lite ids
3329824eed test: harden video live provider release gate
d7cc6f7643 docs: prepare changelog for 2026.4.14
6c0bff111c fix(google): strip Gemini compat base suffixes (#66445)
3587e0ef95 fix(codex): keep auth read diagnostics off stdout (#66451)
82364e901a test(codex): cover exact gpt-5.4 registry upgrades (#66454)
5a5ca6d62c feat(codex): add gpt-5.4-pro forward compat (#66453)
8820a43818 fix(memory): preserve embedding proxy provider prefixes (#66452)
e9f5619716 fix(onboard): cap compat probe max_tokens (#66450)
f4372613d8 fix(media): remap AAC uploads to M4A (#66446)
e58d50b7a8 fix(telegram): trust explicit proxy DNS for media downloads (#66461)
6ee8e194c0 fix(media-understanding): auto-upgrade provider HTTP helper to trusted env proxy mode (#66458)
dfed74b254 fix(hooks): honor configured ollama slug timeout (#66455)
072e8cfe62 test(discord): avoid status fast path in allow-from fixture
a70fdc88e0 fix(github-copilot): enable xhigh for gpt-5.4 (#66437)
4f15d77ecc fix(ollama): enable streaming usage for openai-compat (#66439)
b90d4ea3d7 fix(codex): canonicalize the gpt-5.4-codex alias (#66438)
381a8e860a fix(discord): return native status replies directly (#66434)
56625a189b fix(gateway): scope reset hook assertion
fecd4fcc55 fix(agents) context-engine: per-iteration ingest and assemble for compaction (#63555)
33a698fe10 fix(qa-lab): correct scenario catalog type
7eecfa411d fix(browser): unblock loopback CDP readiness under strict SSRF defaults (#66354)
e59f5ecac3 fix(tools): normalize media model lookups (#66422)
aa0dc118f1 fix: preserve subagent registry runtime import path across source and dist (#66420)
38de896419 fix(agents): honor embedded ollama timeouts (#66418)
900681751d test(qa-lab): seed broken-turn recovery scenarios (#66416)

Resolution

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

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