Skip to content

chore: sync upstream v2026.5.22#73

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

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

Conversation

@github-actions
Copy link
Copy Markdown

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

Status: merge conflicts — manual resolution required

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

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

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

a374c3a5bf test(matrix): stabilize thread binding sweep persistence
89c69c4264 chore(release): sync plugin shrinkwraps for 2026.5.22
df3cadc4ad chore(release): sync plugin versions for 2026.5.22
b0e7b0fe39 chore(release): prepare 2026.5.22
24c7911cfd chore(release): refresh plugin SDK baseline
0b2f8dfbdb fix(release): keep session lock backport scoped
de0cf73b0c fix(agents): add openai-responses family to non-visible turn retry guard (#85603)
199bfe580d fix(agents): omit empty tools array for proxy-like openai-completions endpoints
8a22b33d44 fix(cli): waitForever must keep the event loop alive (#85694)
75b5c76c7f fix(docker): avoid printing gateway token
8ac7cd621b fix(session-lock): enforce maxHoldMs in shouldReclaim during lock acquisition (#85764)
57b956fd7c fix(gateway): omit stream-error placeholders from agent prompts (#85652)
ebab6d1cbe fix(gateway): preserve lifecycle cleanup
5b2989cbb5 fix(gateway): preserve deferred lifecycle errors
71f7f6f9df fix(gateway): pin relative state dir at startup
cefea04b9e refactor: simplify channel catalog cache
098bdb2bf6 perf: reduce gateway benchmark filesystem churn
555cc66a37 perf(gateway): reduce startup filesystem probes
88fac84a18 ci: mount local installer scripts in smoke containers
e03a93b1a3 test: isolate Codex replay timeout outcome
12d760c1b0 test: isolate Codex hook channel context
f6e9aae227 test: isolate Codex duplicate terminal diagnostics
957b874385 test: isolate Codex terminal diagnostic fallback
9d7034adf5 test: drain Codex app-server attempts
690cb199d9 test: isolate Codex native item release guard
b5f13e5611 test: isolate Codex terminal batch scheduler
f63a653137 test: isolate Codex terminal release decision
7fc349418e test: make Codex diagnostic test deterministic
cb26ca8e7c test: bound Codex app-server cleanup waits
2378e3bccc test: align full release dispatch assertion

Resolution

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

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