fix(gateway/restart): write sentinel with continuationMessage on coalesced restart by hclsys · Pull Request #74443 · openclaw/openclaw

hclsys · 2026-04-29T15:25:04Z

Problem

When scheduleGatewaySigusr1Restart returns { coalesced: true } (two paths in src/infra/restart.ts), the beforeEmit hook registered by the gateway tool is never called. This means writeRestartSentinel never fires, so the continuationMessage supplied by the caller is silently dropped.

Fix

After scheduleGatewaySigusr1Restart returns, if the result is coalesced and the caller supplied a continuationMessage, call rewriteRestartSentinel to merge the continuation into any existing sentinel file. The call is fire-and-forget (.catch(() => undefined)) so a missing sentinel does not surface as an error on the coalesced path.

Testing

Typecheck passes: tsc --noEmit --project tsconfig.core.json
Two paths fixed: in-flight coalesced (no hooks called at all) and already-scheduled coalesced (updatePendingRestartEmitHooks overwrites, does not chain)

Fixes #74424.

…esced restart When scheduleGatewaySigusr1Restart returns coalesced=true, the beforeEmit hook is never called, so writeRestartSentinel never fires and any continuationMessage passed by the caller is silently dropped. Call rewriteRestartSentinel after the coalesced return to merge the incoming continuationMessage into any existing sentinel. Fixes openclaw#74424.

aisle-research-bot · 2026-04-29T15:25:10Z

🔒 Aisle Security Analysis

We found 1 potential security issue(s) in this PR:

#	Severity	Title
1	🟡 Medium	Cross-session continuation overwrite when coalescing gateway restart requests

1. 🟡 Cross-session continuation overwrite when coalescing gateway restart requests

Property	Value
Severity	Medium
CWE	CWE-200
Location	`src/agents/tools/gateway-tool.ts:425-433`

Description

In gateway-tool restart handling, when a restart request is coalesced with an already-pending restart, the code rewrites the (global) restart sentinel file to add the new request's continuationMessage.

The restart sentinel is a single global file (restart-sentinel.json) in the state directory.
rewriteRestartSentinel rewrites the existing sentinel payload without validating that the existing payload belongs to the same sessionKey.
If two different sessions/channels request a restart close together and the second request is marked coalesced, the second request can overwrite payload.continuation for the first request.
After boot, server-restart-sentinel uses payload.sessionKey and stored routing context to enqueue and deliver the continuation; overwriting continuation can therefore misroute or leak continuation text across sessions/chats.

Vulnerable code:

if (scheduled.coalesced && continuationMessage) {
  await rewriteRestartSentinel((existing) => ({
    ...existing,
    continuation: buildRestartSuccessContinuation({ sessionKey, continuationMessage }),
  })).catch(() => undefined);
}

Recommendation

Ensure sentinel rewrites cannot mix data across sessions.

Minimal safe guard: only rewrite the sentinel if it matches the current request's session identity (and optionally delivery context), otherwise leave it unchanged.

if (scheduled.coalesced && continuationMessage) {
  await rewriteRestartSentinel((existing) => {
    if ((existing.sessionKey ?? "").trim() !== (sessionKey ?? "").trim()) {
      return existing; // do not overwrite another session's continuation
    }
    return {
      ...existing,
      continuation: buildRestartSuccessContinuation({ sessionKey, continuationMessage }),
    };
  });
}

More robust options:

Store multiple continuations keyed by sessionKey (array/map) and have post-restart logic enqueue each to its own session.
Alternatively, include a restart request token/id in the sentinel and only allow rewrites that present the same token.

Analyzed PR: #74443 at commit d0216a8

_{Last updated on: 2026-04-29T15:26:50Z}

openclaw-barnacle · 2026-04-29T15:25:44Z

Closing this PR because the author has more than 10 active PRs in this repo. Please reduce the active PR queue and reopen or resubmit once it is back under the limit. You can close your own PRs to get back under the limit.

greptile-apps · 2026-04-29T15:28:20Z

Greptile Summary

This PR fixes a bug where continuationMessage was silently dropped when a gateway restart request coalesced with an already-pending or already-in-flight restart (i.e., the beforeEmit hook registered by the coalesced caller was never invoked). The fix adds a rewriteRestartSentinel call after scheduleGatewaySigusr1Restart returns { coalesced: true } to merge the continuation into any existing sentinel file.

Confidence Score: 4/5

Safe to merge — the fix is targeted and well-scoped, with errors swallowed to avoid surfacing on the coalesced path.

No P0 or P1 issues found. The rewriteRestartSentinel call is redundant (no-op) for the already-scheduled + not yet preparing sub-path because updatePendingRestartEmitHooks already ensures the new beforeEmit will run, but it is harmless. All edge cases around missing sentinels are handled by .catch(() => undefined). The fix correctly targets path 1 (in-flight) and is benign for path 2 (scheduled).

No files require special attention.

_{Reviews (1): Last reviewed commit: "fix(gateway/restart): write sentinel wit..." | Re-trigger Greptile}

…t continuations (openclaw#86742) When two sessions issue gateway.restart with continuationMessage close together, the scheduler Path B updatePendingRestartEmitHooks unconditionally overwrote the existing pending hooks, silently dropping the first sessions continuation and potentially routing the second sessions continuation back to the first session (CWE-200 finding flagged by aisle-research-bot on prior attempt openclaw#74443). Add a session-routing guard: scheduleGatewaySigusr1Restart now accepts an optional sessionKey and tracks the pending restarts owning session. Coalesced callers from a different session are rejected at the hook- update step and the new ScheduledRestart.emitHooksQueued: false field surfaces the drop to the caller. The gateway tool propagates this as continuationQueued: false in the tool response, matching openclaw#83370 narrow report-only surface. Same-session debounce/replace and legacy hookless callers behave the same as before. Refs openclaw#86742

…t continuations (#86742) (#87323) * fix(infra/agents): session-routing guard for coalesced gateway restart continuations (#86742) When two sessions issue gateway.restart with continuationMessage close together, the scheduler Path B updatePendingRestartEmitHooks unconditionally overwrote the existing pending hooks, silently dropping the first sessions continuation and potentially routing the second sessions continuation back to the first session (CWE-200 finding flagged by aisle-research-bot on prior attempt #74443). Add a session-routing guard: scheduleGatewaySigusr1Restart now accepts an optional sessionKey and tracks the pending restarts owning session. Coalesced callers from a different session are rejected at the hook- update step and the new ScheduledRestart.emitHooksQueued: false field surfaces the drop to the caller. The gateway tool propagates this as continuationQueued: false in the tool response, matching #83370 narrow report-only surface. Same-session debounce/replace and legacy hookless callers behave the same as before. Refs #86742 * fix(infra): preserve queued restart continuation on forced bypass * fix(infra): make forced restart hook preservation explicit * fix(infra): guard restart continuation ownership before reschedule * fix(infra): report hookless coalesced restarts accurately * fix(infra): trust runtime session for restart sentinel routing * fix(infra): preserve earlier restart reschedule semantics * fix(agents): trust runtime session for update continuations * fix(infra): preserve hookless forced restart continuations --------- Co-authored-by: Peter Steinberger <[email protected]>

…t continuations (openclaw#86742) (openclaw#87323) * fix(infra/agents): session-routing guard for coalesced gateway restart continuations (openclaw#86742) When two sessions issue gateway.restart with continuationMessage close together, the scheduler Path B updatePendingRestartEmitHooks unconditionally overwrote the existing pending hooks, silently dropping the first sessions continuation and potentially routing the second sessions continuation back to the first session (CWE-200 finding flagged by aisle-research-bot on prior attempt openclaw#74443). Add a session-routing guard: scheduleGatewaySigusr1Restart now accepts an optional sessionKey and tracks the pending restarts owning session. Coalesced callers from a different session are rejected at the hook- update step and the new ScheduledRestart.emitHooksQueued: false field surfaces the drop to the caller. The gateway tool propagates this as continuationQueued: false in the tool response, matching openclaw#83370 narrow report-only surface. Same-session debounce/replace and legacy hookless callers behave the same as before. Refs openclaw#86742 * fix(infra): preserve queued restart continuation on forced bypass * fix(infra): make forced restart hook preservation explicit * fix(infra): guard restart continuation ownership before reschedule * fix(infra): report hookless coalesced restarts accurately * fix(infra): trust runtime session for restart sentinel routing * fix(infra): preserve earlier restart reschedule semantics * fix(agents): trust runtime session for update continuations * fix(infra): preserve hookless forced restart continuations --------- Co-authored-by: Peter Steinberger <[email protected]>

openclaw-barnacle Bot added agents Agent runtime and tooling size: XS r: too-many-prs Auto-close: author has more than twenty active PRs. labels Apr 29, 2026

openclaw-barnacle Bot closed this Apr 29, 2026

clawsweeper Bot mentioned this pull request Apr 30, 2026

[Bug]: gateway restart continuationMessage is silently dropped when restart coalesces with an in-flight restart #74424

Closed

songshikang0111 mentioned this pull request May 26, 2026

[Bug]: gateway restart continuationMessage can be accepted but not queued after coalesced restart #86742

Closed

openperf mentioned this pull request May 27, 2026

fix(infra/agents): session-routing guard for coalesced gateway restart continuations (#86742) #87323

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

fix(gateway/restart): write sentinel with continuationMessage on coalesced restart#74443

fix(gateway/restart): write sentinel with continuationMessage on coalesced restart#74443
hclsys wants to merge 1 commit into
openclaw:mainfrom
hclsys:fix/gateway-restart-coalesced-continuation-74424

hclsys commented Apr 29, 2026

Uh oh!

aisle-research-bot Bot commented Apr 29, 2026 •

edited

Loading

Description

Recommendation

Uh oh!

openclaw-barnacle Bot commented Apr 29, 2026

Uh oh!

greptile-apps Bot commented Apr 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Uh oh!

Uh oh!

Conversation

hclsys commented Apr 29, 2026

Problem

Fix

Testing

Uh oh!

aisle-research-bot Bot commented Apr 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🔒 Aisle Security Analysis

Description

Recommendation

Uh oh!

openclaw-barnacle Bot commented Apr 29, 2026

Uh oh!

greptile-apps Bot commented Apr 29, 2026

Greptile Summary

Confidence Score: 4/5

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

aisle-research-bot Bot commented Apr 29, 2026 •

edited

Loading