fix: preserve Telegram topic routing for exec completions#64580
Merged
jalehman merged 2 commits intoApr 11, 2026
Conversation
openclaw-barnacle
Bot
added
agents
Contributor
Greptile SummaryThis PR pins the originating Confidence Score: 5/5Safe to merge — targeted fix with direct regression test coverage for the topic-drift scenario. All findings are P2 style suggestions (one redundant normalizeDeliveryContext call). The core fix — pinning DeliveryContext on ProcessSession at spawn time — is correct, and three new tests exercise the exact failure mode from production. No files require special attention. Prompt To Fix All With AIThis is a comment left during a code review.
Path: src/agents/bash-tools.exec-runtime.ts
Line: 577
Comment:
**Double `normalizeDeliveryContext` call**
`opts.notifyDeliveryContext` has already been normalized in `bash-tools.exec.ts` via `normalizeDeliveryContext({...})` before being passed in here (lines 1326–1331 in `bash-tools.exec.ts`). Calling `normalizeDeliveryContext` again on the session is redundant, though harmless. You could store it directly:
```suggestion
notifyDeliveryContext: opts.notifyDeliveryContext,
```
How can I resolve this? If you propose a fix, please make it concise.Reviews (1): Last reviewed commit: "clawdbot-a2c: pin exec completion delive..." | Re-trigger Greptile |
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
| @@ -564,6 +574,7 @@ export async function runExecProcess(opts: { | |||
| command: opts.command, | |||
| scopeKey: opts.scopeKey, | |||
| sessionKey: opts.sessionKey, | |||
| notifyDeliveryContext: normalizeDeliveryContext(opts.notifyDeliveryContext), | |||
Contributor
There was a problem hiding this comment.
normalizeDeliveryContext call
opts.notifyDeliveryContext has already been normalized in bash-tools.exec.ts via normalizeDeliveryContext({...}) before being passed in here (lines 1326–1331 in bash-tools.exec.ts). Calling normalizeDeliveryContext again on the session is redundant, though harmless. You could store it directly:
Suggested change
| notifyDeliveryContext: normalizeDeliveryContext(opts.notifyDeliveryContext), | |
| notifyDeliveryContext: opts.notifyDeliveryContext, |
Prompt To Fix With AI
This is a comment left during a code review.
Path: src/agents/bash-tools.exec-runtime.ts
Line: 577
Comment:
**Double `normalizeDeliveryContext` call**
`opts.notifyDeliveryContext` has already been normalized in `bash-tools.exec.ts` via `normalizeDeliveryContext({...})` before being passed in here (lines 1326–1331 in `bash-tools.exec.ts`). Calling `normalizeDeliveryContext` again on the session is redundant, though harmless. You could store it directly:
```suggestion
notifyDeliveryContext: opts.notifyDeliveryContext,
```
How can I resolve this? If you propose a fix, please make it concise.
🔒 Aisle Security AnalysisWe found 1 potential security issue(s) in this PR:
1. 🟡 Ambiguous/unvalidated DeliveryContext fields allow delimiter/control-character injection into deliveryContextKey
Description
This becomes security-relevant because delivery-context keys are used to group/compare routing contexts (e.g., announce queues, session delivery comparisons). If an attacker can influence
Vulnerable code: const to = normalizeOptionalString(context.to);
...
return `${normalized.channel}|${normalized.to}|${normalized.accountId ?? ""}|${threadId}`;Although this diff primarily adds new call sites that pass RecommendationHarden
Example (reject unsafe characters and ensure threadId is consistently stringified): const UNSAFE_RE = /[\r\n\u0000-\u001f\u007f|]/;
function normalizeSafeField(v: unknown): string | undefined {
const s = normalizeOptionalString(v);
if (!s) return undefined;
if (UNSAFE_RE.test(s)) return undefined; // or escape
return s;
}
export function normalizeDeliveryContext(context?: DeliveryContext): DeliveryContext | undefined {
if (!context) return undefined;
const channel = normalizeSafeField(context.channel);
const to = normalizeSafeField(context.to);
const accountId = normalizeAccountId(context.accountId);
const threadIdRaw = (typeof context.threadId === "number" && Number.isFinite(context.threadId))
? String(Math.trunc(context.threadId))
: normalizeSafeField(context.threadId);
if (!channel && !to && !accountId && !threadIdRaw) return undefined;
return { channel, to, accountId, ...(threadIdRaw ? { threadId: threadIdRaw } : {}) };
}
export function deliveryContextKey(context?: DeliveryContext): string | undefined {
const n = normalizeDeliveryContext(context);
if (!n?.channel || !n?.to) return undefined;
return JSON.stringify([n.channel, n.to, n.accountId ?? "", n.threadId ?? ""]);
}Also ensure downstream routing code uses the normalized/validated form exclusively. Analyzed PR: #64580 at commit Last updated on: 2026-04-11T22:35:42Z |
jalehman
force-pushed
the
clawdbot-a2c-telegram-exec-topic-fix
branch
from
April 11, 2026 16:09
b896d96 to
d2a4b38
Compare
Regeneration-Prompt: | Fix a Telegram forum topic misroute where delayed exec completion or similar async completion text could be delivered into the wrong topic after the session's stored route drifted. Keep the patch surgical. Preserve immutable origin deliveryContext when background exec completion events are queued, thread that context from the exec tool's ambient channel/session defaults into the process session, and ensure the queued system event carries it instead of relying on later heartbeat fallback to mutable session lastTo/lastThreadId data. Add one focused unit assertion that notifyOnExit events keep the original Telegram topic delivery context and one heartbeat regression that proves work started in topic 47 still delivers back to topic 47 even if the session store later points at topic 2175.
Regeneration-Prompt: | Prepare PR openclaw#64580 after review-pr with no blocking findings. The only required prep change was the workflow-mandated changelog entry under CHANGELOG.md -> Unreleased -> Fixes. Preserve the review conclusion that the code change is already acceptable, do not widen scope beyond the changelog, and include the PR number plus thanks attribution in the changelog line for the Telegram exec forum-topic completion routing fix.
jalehman
force-pushed
the
clawdbot-a2c-telegram-exec-topic-fix
branch
from
April 11, 2026 22:32
d2a4b38 to
f13fb58
Compare
trudbot
pushed a commit
to trudbot/openclaw
that referenced
this pull request
Apr 12, 2026
…4580) * clawdbot-a2c: pin exec completion delivery context Regeneration-Prompt: | Fix a Telegram forum topic misroute where delayed exec completion or similar async completion text could be delivered into the wrong topic after the session's stored route drifted. Keep the patch surgical. Preserve immutable origin deliveryContext when background exec completion events are queued, thread that context from the exec tool's ambient channel/session defaults into the process session, and ensure the queued system event carries it instead of relying on later heartbeat fallback to mutable session lastTo/lastThreadId data. Add one focused unit assertion that notifyOnExit events keep the original Telegram topic delivery context and one heartbeat regression that proves work started in topic 47 still delivers back to topic 47 even if the session store later points at topic 2175. * fix: note Telegram exec topic routing Regeneration-Prompt: | Prepare PR openclaw#64580 after review-pr with no blocking findings. The only required prep change was the workflow-mandated changelog entry under CHANGELOG.md -> Unreleased -> Fixes. Preserve the review conclusion that the code change is already acceptable, do not widen scope beyond the changelog, and include the PR number plus thanks attribution in the changelog line for the Telegram exec forum-topic completion routing fix.
lovewanwan
pushed a commit
to lovewanwan/openclaw
that referenced
this pull request
Apr 28, 2026
…4580) * clawdbot-a2c: pin exec completion delivery context Regeneration-Prompt: | Fix a Telegram forum topic misroute where delayed exec completion or similar async completion text could be delivered into the wrong topic after the session's stored route drifted. Keep the patch surgical. Preserve immutable origin deliveryContext when background exec completion events are queued, thread that context from the exec tool's ambient channel/session defaults into the process session, and ensure the queued system event carries it instead of relying on later heartbeat fallback to mutable session lastTo/lastThreadId data. Add one focused unit assertion that notifyOnExit events keep the original Telegram topic delivery context and one heartbeat regression that proves work started in topic 47 still delivers back to topic 47 even if the session store later points at topic 2175. * fix: note Telegram exec topic routing Regeneration-Prompt: | Prepare PR openclaw#64580 after review-pr with no blocking findings. The only required prep change was the workflow-mandated changelog entry under CHANGELOG.md -> Unreleased -> Fixes. Preserve the review conclusion that the code change is already acceptable, do not widen scope beyond the changelog, and include the PR number plus thanks attribution in the changelog line for the Telegram exec forum-topic completion routing fix.
This was referenced Apr 29, 2026
ogt-redknie
pushed a commit
to ogt-redknie/OPENX
that referenced
this pull request
May 2, 2026
…4580) * clawdbot-a2c: pin exec completion delivery context Regeneration-Prompt: | Fix a Telegram forum topic misroute where delayed exec completion or similar async completion text could be delivered into the wrong topic after the session's stored route drifted. Keep the patch surgical. Preserve immutable origin deliveryContext when background exec completion events are queued, thread that context from the exec tool's ambient channel/session defaults into the process session, and ensure the queued system event carries it instead of relying on later heartbeat fallback to mutable session lastTo/lastThreadId data. Add one focused unit assertion that notifyOnExit events keep the original Telegram topic delivery context and one heartbeat regression that proves work started in topic 47 still delivers back to topic 47 even if the session store later points at topic 2175. * fix: note Telegram exec topic routing Regeneration-Prompt: | Prepare PR openclaw#64580 after review-pr with no blocking findings. The only required prep change was the workflow-mandated changelog entry under CHANGELOG.md -> Unreleased -> Fixes. Preserve the review conclusion that the code change is already acceptable, do not widen scope beyond the changelog, and include the PR number plus thanks attribution in the changelog line for the Telegram exec forum-topic completion routing fix.
github-actions Bot
pushed a commit
to Desicool/openclaw
that referenced
this pull request
May 9, 2026
…4580) * clawdbot-a2c: pin exec completion delivery context Regeneration-Prompt: | Fix a Telegram forum topic misroute where delayed exec completion or similar async completion text could be delivered into the wrong topic after the session's stored route drifted. Keep the patch surgical. Preserve immutable origin deliveryContext when background exec completion events are queued, thread that context from the exec tool's ambient channel/session defaults into the process session, and ensure the queued system event carries it instead of relying on later heartbeat fallback to mutable session lastTo/lastThreadId data. Add one focused unit assertion that notifyOnExit events keep the original Telegram topic delivery context and one heartbeat regression that proves work started in topic 47 still delivers back to topic 47 even if the session store later points at topic 2175. * fix: note Telegram exec topic routing Regeneration-Prompt: | Prepare PR openclaw#64580 after review-pr with no blocking findings. The only required prep change was the workflow-mandated changelog entry under CHANGELOG.md -> Unreleased -> Fixes. Preserve the review conclusion that the code change is already acceptable, do not widen scope beyond the changelog, and include the PR number plus thanks attribution in the changelog line for the Telegram exec forum-topic completion routing fix.
globalcaos
pushed a commit
to globalcaos/tinkerclaw
that referenced
this pull request
May 13, 2026
…4580) * clawdbot-a2c: pin exec completion delivery context Regeneration-Prompt: | Fix a Telegram forum topic misroute where delayed exec completion or similar async completion text could be delivered into the wrong topic after the session's stored route drifted. Keep the patch surgical. Preserve immutable origin deliveryContext when background exec completion events are queued, thread that context from the exec tool's ambient channel/session defaults into the process session, and ensure the queued system event carries it instead of relying on later heartbeat fallback to mutable session lastTo/lastThreadId data. Add one focused unit assertion that notifyOnExit events keep the original Telegram topic delivery context and one heartbeat regression that proves work started in topic 47 still delivers back to topic 47 even if the session store later points at topic 2175. * fix: note Telegram exec topic routing Regeneration-Prompt: | Prepare PR openclaw#64580 after review-pr with no blocking findings. The only required prep change was the workflow-mandated changelog entry under CHANGELOG.md -> Unreleased -> Fixes. Preserve the review conclusion that the code change is already acceptable, do not widen scope beyond the changelog, and include the PR number plus thanks attribution in the changelog line for the Telegram exec forum-topic completion routing fix.
github-actions Bot
pushed a commit
to Desicool/openclaw
that referenced
this pull request
May 24, 2026
…4580) * clawdbot-a2c: pin exec completion delivery context Regeneration-Prompt: | Fix a Telegram forum topic misroute where delayed exec completion or similar async completion text could be delivered into the wrong topic after the session's stored route drifted. Keep the patch surgical. Preserve immutable origin deliveryContext when background exec completion events are queued, thread that context from the exec tool's ambient channel/session defaults into the process session, and ensure the queued system event carries it instead of relying on later heartbeat fallback to mutable session lastTo/lastThreadId data. Add one focused unit assertion that notifyOnExit events keep the original Telegram topic delivery context and one heartbeat regression that proves work started in topic 47 still delivers back to topic 47 even if the session store later points at topic 2175. * fix: note Telegram exec topic routing Regeneration-Prompt: | Prepare PR openclaw#64580 after review-pr with no blocking findings. The only required prep change was the workflow-mandated changelog entry under CHANGELOG.md -> Unreleased -> Fixes. Preserve the review conclusion that the code change is already acceptable, do not widen scope beyond the changelog, and include the PR number plus thanks attribution in the changelog line for the Telegram exec forum-topic completion routing fix.
jameslcowan
pushed a commit
to jameslcowan/openclaw
that referenced
this pull request
Jun 2, 2026
…4580) * clawdbot-a2c: pin exec completion delivery context Regeneration-Prompt: | Fix a Telegram forum topic misroute where delayed exec completion or similar async completion text could be delivered into the wrong topic after the session's stored route drifted. Keep the patch surgical. Preserve immutable origin deliveryContext when background exec completion events are queued, thread that context from the exec tool's ambient channel/session defaults into the process session, and ensure the queued system event carries it instead of relying on later heartbeat fallback to mutable session lastTo/lastThreadId data. Add one focused unit assertion that notifyOnExit events keep the original Telegram topic delivery context and one heartbeat regression that proves work started in topic 47 still delivers back to topic 47 even if the session store later points at topic 2175. * fix: note Telegram exec topic routing Regeneration-Prompt: | Prepare PR openclaw#64580 after review-pr with no blocking findings. The only required prep change was the workflow-mandated changelog entry under CHANGELOG.md -> Unreleased -> Fixes. Preserve the review conclusion that the code change is already acceptable, do not widen scope beyond the changelog, and include the PR number plus thanks attribution in the changelog line for the Telegram exec forum-topic completion routing fix.
25 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Preserves the originating delivery context for delayed exec completion events so Telegram forum-topic completions stay pinned to the topic where the work started, even if the session's stored route later drifts to a different topic.
Why
Background exec completions were being queued by session key alone and later re-resolved from mutable session routing state. In Telegram forum topics that could redirect a completion started in one topic into another topic.
Changes
Testing
pnpm test src/agents/bash-tools.exec-runtime.test.ts src/agents/bash-tools.test.ts src/infra/heartbeat-runner.ghost-reminder.test.ts