fix(agents): preserve announce threadId on sessions.list fallback by SnowSky1 · Pull Request #63506 · openclaw/openclaw

SnowSky1 · 2026-04-09T02:58:37Z

Summary

preserve threadId when resolveAnnounceTarget() falls back to sessions.list
carry deliveryContext.threadId and lastThreadId through announce target hydration
add regression coverage for both target resolution and final A2A announce delivery

Root cause

The legacy A2A announce fallback rehydrated channel, to, and accountId from sessions.list, but it dropped thread/topic context. As a result, final announce deliveries were sent to the top-level channel instead of the originating thread/topic.

Verification

pnpm test -- src/agents/tools/sessions.test.ts src/agents/openclaw-tools.sessions.test.ts
pnpm exec oxfmt --check src/agents/tools/sessions-helpers.ts src/agents/tools/sessions-announce-target.ts src/agents/tools/sessions.test.ts src/agents/openclaw-tools.sessions.test.ts

Closes #63469

SnowSky1 · 2026-04-09T02:59:04Z

@codex review

greptile-apps · 2026-04-09T02:59:47Z

Greptile Summary

This PR fixes a bug where the A2A announce fallback path (resolveAnnounceTarget via sessions.list) rehydrated channel, to, and accountId but silently dropped threadId, causing announce deliveries to land in the top-level channel instead of the originating thread/topic. The fix adds lastThreadId to SessionListRow, reads it (and deliveryContext.threadId) in resolveAnnounceTarget, normalizes both to a string via the existing normalizeOptionalStringifiedId helper, and includes it in the returned AnnounceTarget.

Confidence Score: 5/5

Safe to merge — the change is narrow, well-targeted, and covered by both unit and integration tests.

The fix is minimal and correct: it reads deliveryContext.threadId and the new lastThreadId field (in the same priority order as all other deliveryContext vs last* fields), normalizes via the existing helper, and returns it as part of AnnounceTarget. All remaining findings are P2 or below. Tests validate both code paths (deliveryContext and lastThreadId) as well as the full end-to-end announce delivery.

No files require special attention.

Vulnerabilities

No security concerns identified.

_{Reviews (1): Last reviewed commit: "fix(agents): preserve announce threadId ..." | Re-trigger Greptile}

chatgpt-codex-connector · 2026-04-09T03:05:01Z

Codex Review: Didn't find any major issues. Already looking forward to the next diff.

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

jalehman · 2026-04-09T23:03:01Z

Merged via squash.

Prepared head SHA: a81e85de0c7fd15a5707e5adf0f9813e526a09bc
Merge commit: 03f2951e63c444da80f049477b975314583c6dfe

Thanks @SnowSky1!

@jalehman

…3506) Merged via squash. Prepared head SHA: a81e85d Co-authored-by: SnowSky1 <126348592+SnowSky1@users.noreply.github.com> Co-authored-by: jalehman <550978+jalehman@users.noreply.github.com> Reviewed-by: @jalehman

@jalehman