Skip to content

Cherry-pick de2ccffec: stream tool events live in control chat#1748

Merged
alexey-pelykh merged 1 commit into
mainfrom
cherry-pick/de2ccffec-stream-tool-events
Mar 21, 2026
Merged

Cherry-pick de2ccffec: stream tool events live in control chat#1748
alexey-pelykh merged 1 commit into
mainfrom
cherry-pick/de2ccffec-stream-tool-events

Conversation

@alexey-pelykh

Copy link
Copy Markdown

Cherry-pick from upstream

Upstream commit: de2ccffec
Author: Peter Steinberger steipete@gmail.com

fix(ui): stream tool events live in control chat (openclaw#39104)

Depends on #1747

Conflict resolution:

  • CHANGELOG.md: union merge (both-added non-overlapping entries)
  • app-gateway.ts: composed fork's thinking injection + upstream's hadToolEvents tracking; preserved fork's early-return pattern with hadToolEvents check in both exit paths; applied RemoteClawApp rebrand to new loadChatHistory calls
  • app-render.ts, app.ts, views/chat.ts, app-tool-stream.ts: both-added independent properties (fork's thinkingStream + upstream's streamSegments)
  • controllers/chat.ts: kept fork's removal of chatThinkingLevel, added upstream's stream clearing on history load

@alexey-pelykh alexey-pelykh force-pushed the cherry-pick/de2ccffec-stream-tool-events branch from bbb7459 to 1fedd75 Compare March 21, 2026 07:00
@alexey-pelykh alexey-pelykh enabled auto-merge (squash) March 21, 2026 07:00
Land openclaw#39104 by @jakepresent.

Co-authored-by: Jake Present <jakepresent@microsoft.com>
(cherry picked from commit de2ccff)
@alexey-pelykh alexey-pelykh force-pushed the cherry-pick/de2ccffec-stream-tool-events branch from 1fedd75 to 00f54d9 Compare March 21, 2026 07:05
@alexey-pelykh alexey-pelykh merged commit 929581b into main Mar 21, 2026
7 checks passed
@alexey-pelykh alexey-pelykh deleted the cherry-pick/de2ccffec-stream-tool-events branch March 21, 2026 07:09
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.

2 participants