Skip to content

chore: sync upstream v2026.3.1#30

Merged
RedBeardEth merged 591 commits intomainfrom
sync/upstream-release-v2026.3.1
Mar 2, 2026
Merged

chore: sync upstream v2026.3.1#30
RedBeardEth merged 591 commits intomainfrom
sync/upstream-release-v2026.3.1

Conversation

@github-actions
Copy link

@github-actions github-actions bot commented Mar 2, 2026

Status: merge conflicts — manual resolution required

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

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

Conflicted files

  • .github/workflows/auto-response.yml
  • .github/workflows/ci.yml
  • pnpm-lock.yaml

Upstream changes (588 commits)

d76b224e2 docs: update appcast for 2026.3.1
92ad89da0 build: prepare 2026.3.1-beta.1 release
eeb72097b Gateway: add healthz/readyz probe endpoints for container checks (#31272)
0a1eac6b0 fix(ios): eliminate voice wake and xcode build warnings
7073f6361 fix(ios): enforce main-actor device status APIs
cb484f44e fix: resolve i18n merge conflict and test hoist failure
96ffbb5aa CLI: add config path subcommand to print active config file path (#26256)
dc2290aeb fix(ci): drop redundant env assertions in daemon status
8b05e4091 fix(discord): prefer names in allowlist resolution logs
b7615e0ce Exec/ACP: inject OPENCLAW_SHELL into child shell env (#31271)
aeb817353 style(changelog): apply oxfmt
1c0d36eed fix(ci): resolve i18n typing and generated-policy drift
fa9148400 fix(android): align lint gates and photo permission handling
37d036714 fix(thinking): default Claude 4.6 to adaptive
4691aab01 fix(cron): guard against year-rollback in croner nextRun (#30777)
6fc0787bf chore(deps): bump workspace dependencies
8208f5e82 docs: reorder unreleased changelog by user impact
619dfa88c fix(discord): enrich allowlist resolution logs
d17f4432b chore: fix gate formatting and raw-fetch allowlist lines
7b3f506e6 style(swift): apply swiftformat and swiftlint fixes
e1f3ded03 refactor: split telegram delivery and unify media/frontmatter/i18n pipelines
706cfcd54 fix: isolate docker onboard e2e config env
f46bd2e0c refactor(feishu): split monitor startup and transport concerns
c0bf42f2a refactor: centralize delivery/path/media/version lifecycle
f4f094fc3 test(mattermost): cover defaultAccount resolution
41537e930 fix(channels): add optional defaultAccount routing
0437ac1a8 fix(gateway): raise health-monitor restart cap
0f2dce048 fix(agents): prioritize per-model thinking defaults (#30439)
3fc19ed7d fix: harden feishu startup probe sequencing (#29941) (thanks @bmendonca3)
abc7b6fbe Feishu: skip duplicate bot-info retries after preflight

Resolution

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

Mark this PR as Ready for review once conflicts are resolved.


This PR was created by .github/workflows/upstream-release-sync.yml.

vincentkoc and others added 30 commits March 1, 2026 12:56
* CI: remove vitest JSON report upload steps

* Tests: stop injecting vitest JSON reporter

* Tests: remove vitest slowest report script
openclaw#29940)

* fix(telegram): preserve HTTP proxy env in global dispatcher workaround

* telegram: document request-scoped proxy dispatcher constraint

* telegram: assert proxy path never mutates global dispatcher

* changelog: credit telegram proxy env regression fix

---------

Co-authored-by: Rylen Anil <rylen.anil@gmail.com>
…Path is empty (openclaw#30333)

Merged via squash.

Prepared head SHA: 12591f3
Co-authored-by: Sid-Qin <201593046+Sid-Qin@users.noreply.github.com>
Co-authored-by: velvet-shark <126378+velvet-shark@users.noreply.github.com>
Reviewed-by: @velvet-shark
…penclaw#30957)

* ACP: enforce sessions_spawn-only thread creation for harness spawns

* skills(acpx): require acp-router preflight for ACP thread spawns

* fix: enforce ACP thread spawn via sessions_spawn only (openclaw#30957) (thanks @dutifulbob)

---------

Co-authored-by: Onur <2453968+osolmaz@users.noreply.github.com>
…enclaw#30975)

* CLI argv: add strict root help invocation guard

* Entry: add root help fast-path bootstrap bypass

* CLI context: lazily resolve channel options

* CLI context tests: cover lazy channel option resolution

* CLI argv tests: cover root help invocation detection

* Changelog: note additional startup path optimizations

* Changelog: split startup follow-up into openclaw#30975 entry

* CLI channel options: load precomputed startup metadata

* CLI channel options tests: cover precomputed metadata path

* Build: generate CLI startup metadata during build

* Build script: invoke CLI startup metadata generator

* CLI routes: preload plugins for routed health

* CLI routes tests: assert health plugin preload

* CLI: add experimental bundled entry and snapshot helper

* Tools: compare CLI startup entries in benchmark script

* Docs: add startup tuning notes for Pi and VM hosts

* CLI: drop bundled entry runtime toggle

* Build: remove bundled and snapshot scripts

* Tools: remove bundled-entry benchmark shortcut

* Docs: remove bundled startup bench examples

* Docs: remove Pi bundled entry mention

* Docs: remove VM bundled entry mention

* Changelog: remove bundled startup follow-up claims

* Build: remove snapshot helper script

* Build: remove CLI bundle tsdown config

* Doctor: add low-power startup optimization hints

* Doctor: run startup optimization hint checks

* Doctor tests: cover startup optimization host targeting

* Doctor tests: mock startup optimization note export

* CLI argv: require strict root-only help fast path

* CLI argv tests: cover mixed root-help invocations

* CLI channel options: merge metadata with runtime catalog

* CLI channel options tests: assert dynamic catalog merge

* Changelog: align openclaw#30975 startup follow-up scope

* Docs tests: remove secondary-entry startup bench note

* Docs Pi: add systemd recovery reference link

* Docs VPS: add systemd recovery reference link
* Doctor: detect macOS cloud-synced state directories

* Doctor tests: cover cloud-synced macOS state detection

* Docs: note cloud-synced state warning in doctor guide

* Docs: recommend local macOS state dir placement

* Changelog: add macOS cloud-synced state dir warning

* Changelog: credit macOS cloud state warning PR

* Doctor state: anchor cloud-sync roots to macOS home

* Doctor tests: cover OPENCLAW_HOME cloud-sync override

* Doctor state: prefer resolved target for cloud detection

* Doctor tests: cover local-target cloud symlink case
Co-authored-by: Jonathan Jing <achillesjing@gmail.com>
steipete and others added 24 commits March 2, 2026 04:09
)

* fix(cron): guard against year-rollback in croner nextRun

Croner can return a past-year timestamp for some timezone/date
combinations (e.g. Asia/Shanghai).  When nextRun returns a value at or
before nowMs, retry from the next whole second and, if still stale,
from midnight-tomorrow UTC before giving up.

Closes openclaw#30351

* googlechat: guard API calls with SSRF-safe fetch

* test: fix hoisted plugin context mock setup

---------

Co-authored-by: Tak Hoffman <781889+Takhoffman@users.noreply.github.com>
* exec: mark runtime shell context in exec env

* tests(exec): cover OPENCLAW_SHELL in gateway exec

* tests(exec): cover OPENCLAW_SHELL in pty mode

* acpx: mark runtime shell context for spawned process

* tests(acpx): log OPENCLAW_SHELL in runtime fixture

* tests(acpx): assert OPENCLAW_SHELL in runtime prompt

* docs(env): document OPENCLAW_SHELL runtime markers

* docs(exec): describe OPENCLAW_SHELL exec marker

* docs(acp): document OPENCLAW_SHELL acp marker

* docs(gateway): note OPENCLAW_SHELL for background exec

* tui: tag local shell runs with OPENCLAW_SHELL

* tests(tui): assert OPENCLAW_SHELL in local shell runner

* acp client: tag spawned bridge env with OPENCLAW_SHELL

* tests(acp): cover acp client OPENCLAW_SHELL env helper

* docs(env): include acp-client and tui-local shell markers

* docs(acp): document acp-client OPENCLAW_SHELL marker

* docs(tui): document tui-local OPENCLAW_SHELL marker

* exec: keep shell runtime env string-only for docker args

* changelog: note OPENCLAW_SHELL runtime markers
…nclaw#26256)

Merged via squash.

Prepared head SHA: b11c593
Co-authored-by: cyb1278588254 <48212932+cyb1278588254@users.noreply.github.com>
Co-authored-by: gumadeiras <5599352+gumadeiras@users.noreply.github.com>
Reviewed-by: @gumadeiras
…nclaw#31272)

* Gateway: add HTTP liveness/readiness probe routes

* Gateway tests: cover probe route auth bypass and methods

* Docker Compose: add gateway /healthz healthcheck

* Docs: document Docker probe endpoints

* Dockerfile: note built-in probe endpoints

* Gateway: make probe routes fallback-only to avoid shadowing

* Gateway tests: verify probe paths do not shadow plugin routes

* Changelog: note gateway container probe endpoints
@github-actions github-actions bot added the upstream-sync Automated upstream release sync label Mar 2, 2026
@ponderingdemocritus ponderingdemocritus marked this pull request as ready for review March 2, 2026 21:06
@RedBeardEth RedBeardEth merged commit 5432c45 into main Mar 2, 2026
2 of 9 checks passed
@RedBeardEth RedBeardEth deleted the sync/upstream-release-v2026.3.1 branch March 2, 2026 23:03
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.