Skip to content

chore: sync upstream v2026.4.29#63

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

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

Conversation

@github-actions
Copy link
Copy Markdown

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

Status: merge conflicts — manual resolution required

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

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

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

a448042c2e test(qa): extend restart boundary wait
a911070444 chore(release): prepare 2026.4.29
d052f85b55 test(release): align beta validation harness
f68c232294 chore(release): prepare 2026.4.29-beta.4
b0483510a9 fix(auth): scope external CLI credential discovery
cad90268c0 fix(codex): time out silent app-server turns
25cb61cacb fix(plugins): harden runtime mirrors
a4d338c170 fix: guard blank prompt submissions (#74168)
6a18a2edc9 fix(deepseek): expose V4 max thinking levels (#73008)
8be5a7eed7 fix: keep telegram polling timeout above long poll
62809b2560 fix(browser): use source config for proxy decisions
56c9b18457 fix: reduce runtime mirror and signal group regressions
33d77a08d1 fix(signal): match group allowlists against group ids
7a7de82c58 fix: preserve OpenAI Codex OAuth transport (#75111)
6bad056c18 docs(config): refresh compaction baseline
3f0e6182e5 feat(agents): add mid-turn compaction precheck (#73499)
9204476b19 chore(release): prepare 2026.4.29-beta.3
cdea49eb56 test(parallels): fix macos npm update sudo fallback
46f6b14385 fix(release): keep tool guard backport scoped
9ee651e1f5 fix: align tool-result guard budget
a7be4b3aff test(gateway): align lock conflict success expectation
76bb2c6a45 fix(gateway): stop systemd EADDRINUSE restart loops
c874749ccb test(release): install kitchen sink before channel config
1e78689ed8 chore(release): refresh plugin sdk api baseline
eadd054348 fix(release): satisfy lint preflight
1d8769604e chore(release): prepare 2026.4.29-beta.2
10c39c33bf test(parallels): accept silent Windows background starts
d1708b8003 test(parallels): stabilize Windows background launches
15f95e3823 test(parallels): harden npm update guest scripts
6c0ce491af test(parallels): retry missing Windows background launch

Resolution

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

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