Skip to content

maintenance: selective upstream openclaw sync 2026-05-25#235

Merged
frankhli843 merged 5 commits into
mainfrom
maintenance/upstream-openclaw-20260525
May 25, 2026
Merged

maintenance: selective upstream openclaw sync 2026-05-25#235
frankhli843 merged 5 commits into
mainfrom
maintenance/upstream-openclaw-20260525

Conversation

@frankhli843

Copy link
Copy Markdown

Summary

Selective cherry-picks from upstream openclaw/openclaw to bring Gemmaclaw current on high-value bug fixes and improvements.

Commits included

Intentionally skipped

  • Telegram access-groups refactor (requires extensions/telegram/src/access-groups.ts from a larger refactoring chain)
  • Agent cache cherry-pick 3c8d101f5a (conflicts in 8+ core files — too risky for selective pick)

Test plan

  • pnpm check:changed — typecheck, lint, tests all green
  • GEMMACLAW_LOCAL_AGENT_SMOKE_REQUIRED=1 GEMMACLAW_LOCAL_AGENT_SMOKE_MODEL=gemma-4-26B-A4B-it-Q4_K_M pnpm test:docker:gemmaclaw-setup-live-smoke — both container and non-container flows passed

SebTardif and others added 5 commits May 24, 2026 21:05
…penclaw#82952)

* fix(compaction): preserve partial summary on mid-chain chunk failure

When summarizing multiple chunks, if a chunk fails after at least one
chunk has already succeeded, return the partial summary instead of
propagating the error and losing all summarization progress.

Abort and timeout errors still propagate immediately. First-chunk
failures still rethrow so the existing fallback path runs.

Signed-off-by: Sebastien Tardif <sebtardif@ncf.ca>

* fix(compaction): use content array for assistant messages to match updated AgentMessage type

* fix(compaction): use as-unknown-as-AgentMessage cast for assistant test fixtures

---------

Signed-off-by: Sebastien Tardif <sebtardif@ncf.ca>
…re (openclaw#85787)

maybeRecoverSuspiciousConfigRead unconditionally recorded
lastObservedSuspiciousSignature in health state even when
restoredFromBackup was false (copyFile failed). The guard at
resolveConfigReadRecoveryContext then prevented the same
signature from ever being retried, permanently accepting the
suspicious config on every subsequent launch.

Only record the dedup signature when the backup restore
actually succeeded.
Summary:
- The branch updates OpenRouter dynamic model capability parsing to prefer `top_provider.context_length`, bump ... sk cache version, adds regression coverage and a changelog entry, and adds script helper declaration files.
- Reproducibility: yes. from source and live catalog evidence rather than an authenticated inference turn. Cur ... catalog currently reports a smaller endpoint-specific `top_provider.context_length` for the reported model.

Automerge notes:
- PR branch already contained follow-up commit before automerge: fix(openrouter): use endpoint context limits
- PR branch already contained follow-up commit before automerge: fix(clawsweeper): address review for automerge-openclaw-openclaw-8594…

Validation:
- ClawSweeper review passed for head 76fcc36.
- Required merge gates passed before the squash merge.

Prepared head SHA: 76fcc36
Review: openclaw#86041 (comment)

Co-authored-by: Andy Ye <35905412+TurboTheTurtle@users.noreply.github.com>
Co-authored-by: clawsweeper <274271284+clawsweeper[bot]@users.noreply.github.com>
Co-authored-by: clawsweeper[bot] <274271284+clawsweeper[bot]@users.noreply.github.com>
Approved-by: takhoffman
Co-authored-by: takhoffman <781889+takhoffman@users.noreply.github.com>
…claw#82943)

* fix: log subagent swallowed errors in hook emission and restore paths

Wire createSubsystemLogger into the two silent catch blocks that
discard errors during subagent lifecycle:

1. emitSubagentEndedHookOnce (subagent-registry-completion.ts):
   catch { return false } -> catch (err) { log.warn(...); return false }

2. restoreSubagentRunsOnce (subagent-registry.ts):
   catch { /* ignore */ } -> catch (err) { log.warn(...) }

Both paths now log the error message before continuing, providing
a diagnostic trail when hook emission or disk restore fails silently.

Signed-off-by: Sebastien Tardif <sebtardif@ncf.ca>

* test(agents): keep provider test mocks current

---------

Signed-off-by: Sebastien Tardif <sebtardif@ncf.ca>
Co-authored-by: Peter Steinberger <steipete@gmail.com>
@frankhli843 frankhli843 merged commit 58b11b8 into main May 25, 2026
105 of 106 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants