Fix: Recover orphaned session context branch on missing parentId by Octane0411 · Pull Request #7 · OasAIStudio/openclaw

Octane0411 · 2026-03-08T08:54:18Z

Summary

Fixes session restoration when the trailing user leaf has a missing parentId by recovering to the nearest valid non-user ancestor before appending the next user prompt.
Prevents unintended context collapse to an orphaned tail branch without emitting compaction events.
Adds the same parentId fallback to oversized tool-result truncation so context can be preserved when parentId pointers are missing.

Security Impact

No security-sensitive behavior is changed.
The fix only affects local session transcript traversal/branch selection during recovery.
No user credentials, tokens, or external network calls were modified.

Repro+Verification

Repro scenario: resume a long-lived session with a trailing user transcript entry lacking parentId.
Expected before: current run resets to root and the active session context collapses despite no compaction event.
Expected after: recovery branches to a valid ancestor when possible, preserving prior context and only resetting when no safe parent exists.

Testing

Code changes were validated by local static inspection of recovery branches in:
- run/attempt.ts
- tool-result-truncation.ts
Full integration run was not executed in this environment.

AI Assisted

This change was prepared with Codex-assisted analysis and patching based on session transcript/orphan-parent behavior.

Fixes

Fixes [Bug]: Main session context collapses onto an orphan branch with Compactions: 0 openclaw/openclaw#39609.

* fix(slack): route system events via binding-aware session keys * fix(slack): pass sender to system event session resolver * fix(slack): include sender context for interaction session routing * fix(slack): include modal submitter in session routing * test(slack): cover binding-aware system event routing * test(slack): update interaction session key assertions * test(slack): assert reaction session routing carries sender * docs(changelog): note slack system event routing fix * Update CHANGELOG.md

@gumadeiras

…ate model loads (openclaw#15639) Merged via squash. Prepared head SHA: a085fc2 Co-authored-by: SubtleSpark <43933609+SubtleSpark@users.noreply.github.com> Co-authored-by: gumadeiras <5599352+gumadeiras@users.noreply.github.com> Reviewed-by: @gumadeiras

@shakkernerd

…law#27490) Merged via squash. Prepared head SHA: e4183b3 Co-authored-by: Sid-Qin <201593046+Sid-Qin@users.noreply.github.com> Co-authored-by: shakkernerd <165377636+shakkernerd@users.noreply.github.com> Reviewed-by: @shakkernerd

@shakkernerd

…openclaw#33634) Merged via squash. Prepared head SHA: 67dffc3 Co-authored-by: Yuandiaodiaodiao <33371662+Yuandiaodiaodiao@users.noreply.github.com> Co-authored-by: shakkernerd <165377636+shakkernerd@users.noreply.github.com> Reviewed-by: @shakkernerd

@gumadeiras

…ath pinning (openclaw#33137) Merged via squash. Prepared head SHA: a798790 Co-authored-by: Sid-Qin <201593046+Sid-Qin@users.noreply.github.com> Co-authored-by: gumadeiras <5599352+gumadeiras@users.noreply.github.com> Reviewed-by: @gumadeiras

…w#24285) createOllamaStreamFn() only accepted baseUrl, ignoring custom headers configured in models.providers.<provider>.headers. This caused 403 errors when Ollama endpoints are behind reverse proxies that require auth headers (e.g. X-OLLAMA-KEY via HAProxy). Add optional defaultHeaders parameter to createOllamaStreamFn() and merge them into every fetch request. Provider headers from config are now passed through at the call site in the embedded runner. Fixes openclaw#24285

…liuxiaopai-ai

…liuxiaopai-ai

@liuxiaopai-ai

…thanks @liuxiaopai-ai

* daemon(systemd): target sudo caller user scope * test(systemd): cover sudo user scope commands * infra(ports): fall back to ss when lsof missing * test(ports): verify ss fallback listener detection * cli(gateway): use probe fallback for restart health * test(gateway): cover restart-health probe fallback

@jalehman

…5555) Merged via squash. Prepared head SHA: 0b1df34 Co-authored-by: rodrigouroz <384037+rodrigouroz@users.noreply.github.com> Co-authored-by: jalehman <550978+jalehman@users.noreply.github.com> Reviewed-by: @jalehman

…penclaw#34884) * daemon(systemd): fall back to machine user scope when user bus is missing * test(systemd): cover machine scope fallback for user-bus errors * test(systemd): reset execFile mock state across cases * test(systemd): make machine-user fallback assertion portable * fix(daemon): keep root sudo path on direct user scope * test(systemd): cover sudo root user-scope behavior * ci: use resolvable bun version in setup-node-env

@jalehman

…extWindow (openclaw#34275) Merged via squash. Prepared head SHA: f9d111d Co-authored-by: RealKai42 <44634134+RealKai42@users.noreply.github.com> Co-authored-by: jalehman <550978+jalehman@users.noreply.github.com> Reviewed-by: @jalehman

@jalehman

…action (openclaw#25029) (openclaw#25098) Merged via squash. Prepared head SHA: 8cd6cc8 Co-authored-by: echoVic <16428813+echoVic@users.noreply.github.com> Co-authored-by: jalehman <550978+jalehman@users.noreply.github.com> Reviewed-by: @jalehman

)

@dvrshil

) Merged via squash. Prepared head SHA: f89cc6a Co-authored-by: HOYALIM <166576253+HOYALIM@users.noreply.github.com> Co-authored-by: dvrshil <81693876+dvrshil@users.noreply.github.com> Reviewed-by: @dvrshil

@anisoptera

@anisoptera) (openclaw#34794) Co-authored-by: Ayaan Zaidi <zaidi@uplause.io>

@shakkernerd

Merged via squash. Prepared head SHA: e9a10cf Co-authored-by: RealKai42 <44634134+RealKai42@users.noreply.github.com> Co-authored-by: shakkernerd <165377636+shakkernerd@users.noreply.github.com> Reviewed-by: @shakkernerd

@dutifulbob

…claw#34873) * docs: add ACP persistent binding experiment plan * docs: align ACP persistent binding spec to channel-local config * docs: scope Telegram ACP bindings to forum topics only * docs: lock bound /new and /reset behavior to in-place ACP reset * ACP: add persistent discord/telegram conversation bindings * ACP: fix persistent binding reuse and discord thread parent context * docs: document channel-specific persistent ACP bindings * ACP: split persistent bindings and share conversation id helpers * ACP: defer configured binding init until preflight passes * ACP: fix discord thread parent fallback and explicit disable inheritance * ACP: keep bound /new and /reset in-place * ACP: honor configured bindings in native command flows * ACP: avoid configured fallback after runtime bind failure * docs: refine ACP bindings experiment config examples * acp: cut over to typed top-level persistent bindings * ACP bindings: harden reset recovery and native command auth * Docs: add ACP bound command auth proposal * Tests: normalize i18n registry zh-CN assertion encoding * ACP bindings: address review findings for reset and fallback routing * ACP reset: gate hooks on success and preserve /new arguments * ACP bindings: fix auth and binding-priority review findings * Telegram ACP: gate ensure on auth and accepted messages * ACP bindings: fix session-key precedence and unavailable handling * ACP reset/native commands: honor fallback targets and abort on bootstrap failure * Config schema: validate ACP binding channel and Telegram topic IDs * Discord ACP: apply configured DM bindings to native commands * ACP reset tails: dispatch through ACP after command handling * ACP tails/native reset auth: fix target dispatch and restore full auth * ACP reset detection: fallback to active ACP keys for DM contexts * Tests: type runTurn mock input in ACP dispatch test * ACP: dedup binding route bootstrap and reset target resolution * reply: align ACP reset hooks with bound session key * docs: replace personal discord ids with placeholders * fix: add changelog entry for ACP persistent bindings (openclaw#34873) (thanks @dutifulbob) --------- Co-authored-by: Onur <2453968+osolmaz@users.noreply.github.com>

…aw#34841) * docs(telegram): recommend allowlist for single-user bots * docs(telegram): condense single-user allowlist note --------- Co-authored-by: echoVic <echovic@163.com>

@jalehman

…aming card (openclaw#35628) Merged via squash. Prepared head SHA: 62c3fec Co-authored-by: Sid-Qin <201593046+Sid-Qin@users.noreply.github.com> Co-authored-by: jalehman <550978+jalehman@users.noreply.github.com> Reviewed-by: @jalehman

@mukhtharcm

…cs tests (openclaw#27160) Merged via squash. Prepared head SHA: 6cefb1d Co-authored-by: turian <65918+turian@users.noreply.github.com> Co-authored-by: mukhtharcm <56378562+mukhtharcm@users.noreply.github.com> Reviewed-by: @mukhtharcm

@greptile-apps

…ces (openclaw#34503) * fix(subagents): strip reply tags from completion delivery text * test(subagents): cover reply-tag stripping in cron completion sends * changelog: note iMessage reply-tag stripping in completion announces * Update CHANGELOG.md * Apply suggestion from @greptile-apps[bot] Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> --------- Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>

…ort mode (openclaw#36177) Verified: - pnpm build - pnpm check (fails on pre-existing origin/main lint debt in extensions/mattermost imports) - pnpm test:macmini Co-authored-by: Tak Hoffman <781889+Takhoffman@users.noreply.github.com>

…penclaw#36197) Verified: - pnpm install --frozen-lockfile - pnpm build - pnpm check (fails on pre-existing origin/main lint debt in extensions/mattermost imports) - pnpm test:macmini Co-authored-by: Tak Hoffman <781889+Takhoffman@users.noreply.github.com>

@mukhtharcm

Merged via squash. Prepared head SHA: 8a25e60 Co-authored-by: tonydehnke <36720180+tonydehnke@users.noreply.github.com> Co-authored-by: mukhtharcm <56378562+mukhtharcm@users.noreply.github.com> Reviewed-by: @mukhtharcm

@Sid-Qin

…ntrolled flag - Removes OpenClaw's default `--disable-blink-features=AutomationControlled` Chrome launch switch to avoid unsupported-flag warnings in newer Chrome (openclaw#35721). - Preserves compatibility for older Chrome via `browser.extraArgs` override behavior (source analysis: openclaw#35770, openclaw#35728, openclaw#35727, openclaw#35885). - Synthesis attribution: thanks @Sid-Qin, @kevinWangSheng, @ningding97, @Naylenv, @clawbie. Source PR refs: openclaw#35734, openclaw#35770, openclaw#35728, openclaw#35727, openclaw#35885 Co-authored-by: Sid-Qin <Sid-Qin@users.noreply.github.com> Co-authored-by: kevinWangSheng <kevinWangSheng@users.noreply.github.com> Co-authored-by: ningding97 <ningding97@users.noreply.github.com> Co-authored-by: Naylenv <Naylenv@users.noreply.github.com> Co-authored-by: clawbie <clawbie@users.noreply.github.com> Co-authored-by: Takhoffman <Takhoffman@users.noreply.github.com>

…enclaw#36430) When the Feishu API hangs or responds slowly, the sendChain never settles, causing the per-chat queue to remain in a processing state forever and blocking all subsequent messages in that thread. This adds a 30-second default timeout to all Feishu HTTP requests by providing a timeout-aware httpInstance to the Lark SDK client. Closes openclaw#36412 Co-authored-by: Ayane <wangruofei@soulapp.cn>

… (openclaw#36333)

) Verified: - pnpm build - pnpm check - pnpm test:macmini Co-authored-by: Takhoffman <781889+Takhoffman@users.noreply.github.com> Co-authored-by: Tak Hoffman <781889+Takhoffman@users.noreply.github.com>

…law#36358) * fix(feishu): accept groupPolicy "allowall" as alias for "open" When users configure groupPolicy: "allowall" in Feishu channel config, the Zod schema rejects the value and the runtime policy check falls through to the allowlist path. With an empty allowFrom array, all group messages are silently dropped despite the intended "allow all" semantics. Accept "allowall" at the schema level (transform to "open") and add a runtime guard in isFeishuGroupAllowed so the value is handled even if it bypasses schema validation. Closes openclaw#36312 Made-with: Cursor * Feishu: tighten allowall alias handling and coverage --------- Co-authored-by: Tak Hoffman <781889+Takhoffman@users.noreply.github.com>

## Summary\n\nFeishu group slash command parsing is fixed for mentions and command probes across authorization paths.\n\nThis includes:\n- Normalizing bot mention text in group context for reliable slash detection in message parsing.\n- Adding command-probe normalization for group slash invocations.\n\nCo-authored-by: Sid Qin <sidqin0410@gmail.com>\nCo-authored-by: Tak Hoffman <781889+Takhoffman@users.noreply.github.com>

@liuxiaopai-ai

- Feishu/group slash command detection: normalize group mention wrappers before command-authorization probing so mention-prefixed commands are recognized in group routing.\n- Source PR: openclaw#36011\n- Contributor: @liuxiaopai-ai\n\nCo-authored-by: Tak Hoffman <781889+Takhoffman@users.noreply.github.com>\nCo-authored-by: liuxiaopai-ai <73659136+liuxiaopai-ai@users.noreply.github.com>

@gumadeiras

…ld (fixes openclaw#35131) (openclaw#35177) Merged via squash. Prepared head SHA: d9a2869 Co-authored-by: maweibin <18023423+maweibin@users.noreply.github.com> Co-authored-by: gumadeiras <5599352+gumadeiras@users.noreply.github.com> Reviewed-by: @gumadeiras

…aw#36500) * fix(feishu): avoid media regressions from global http timeout * fix(feishu): source HTTP timeout from config * fix(feishu): apply media timeout override to image uploads * fix(feishu): invalidate cached client when timeout changes * fix(feishu): clamp timeout values and cover image download

…guardrails (openclaw#35094)

@jalehman

…flow, trigger compaction (openclaw#35934) Merged via squash. Prepared head SHA: 20fa772 Co-authored-by: RealKai42 <44634134+RealKai42@users.noreply.github.com> Co-authored-by: jalehman <550978+jalehman@users.noreply.github.com> Reviewed-by: @jalehman

@jalehman

…es (openclaw#36451) Merged via squash. Prepared head SHA: 52dd631 Co-authored-by: Sid-Qin <201593046+Sid-Qin@users.noreply.github.com> Co-authored-by: jalehman <550978+jalehman@users.noreply.github.com> Reviewed-by: @jalehman

…enclaw#36445) - Prevent Control UI session render crashes when `marked.parse()` encounters pathological recursive markdown by safely falling back to escaped `<pre>` output. - Tighten markdown fallback regression coverage and keep changelog attribution in sync for this crash-hardening path. Co-authored-by: Bin Deng <dengbin@romangic.com> Co-authored-by: Tak Hoffman <781889+Takhoffman@users.noreply.github.com>

@jalehman

…ent orphaned files (openclaw#35493) Merged via squash. Prepared head SHA: 0d95549 Co-authored-by: byungsker <72309817+byungsker@users.noreply.github.com> Co-authored-by: jalehman <550978+jalehman@users.noreply.github.com> Reviewed-by: @jalehman

@jalehman

…ptPolicy (openclaw#32813) Merged via squash. Prepared head SHA: f522d21 Co-authored-by: Sid-Qin <201593046+Sid-Qin@users.noreply.github.com> Co-authored-by: jalehman <550978+jalehman@users.noreply.github.com> Reviewed-by: @jalehman

@altaywtf

…wn text (openclaw#32972) Merged via squash. Prepared head SHA: 813c16f Co-authored-by: stakeswky <64798754+stakeswky@users.noreply.github.com> Co-authored-by: altaywtf <9790196+altaywtf@users.noreply.github.com> Reviewed-by: @altaywtf

vincentkoc and others added 30 commits March 4, 2026 08:44

Delete changelog/fragments directory

88ee571

Agents: add generic poll-vote action support

76bfd9b

test(ollama): add default header precedence coverage

7531a3e

chore(changelog): add PR entry openclaw#24337 thanks @echoVic

e6f0203

Outbound: allow text-only plugin adapters

efdf2ca

Outbound: avoid empty multi-media fallback sends

bb07b2b

chore(changelog): align outbound adapter entry openclaw#32788 thanks @…

a970cae

…liuxiaopai-ai

fix(outbound): fail media-only text-only adapter fallback

698c200

chore(changelog): clarify outbound media-only fallback openclaw#32788 …

2123265

…thanks @liuxiaopai-ai

fix(review): enforce behavioral sweep validation

4cc293d

Changelog: add daemon systemd user-bus fallback entry (openclaw#34884)

8c5692a

Changelog: add gateway restart health entry (openclaw#34874)

9c68470

fix: finalize spanish locale support

b3fb881

fix: add spanish locale support (openclaw#35038) (thanks @DaoPromociones

ed05810

)

fix(deps): patch hono transitive audit vulnerabilities

809f951

fix(security): avoid prototype-chain account path checks (openclaw#34982

da0e245

) Merged via squash. Prepared head SHA: f89cc6a Co-authored-by: HOYALIM <166576253+HOYALIM@users.noreply.github.com> Co-authored-by: dvrshil <81693876+dvrshil@users.noreply.github.com> Reviewed-by: @dvrshil

fix(deps): bump tar to 7.5.10

4d06c90

docs(changelog): document dependency security fixes

4989485

fix: restore auto-reply system events timeline (openclaw#34794) (thanks

432e022

@anisoptera) (openclaw#34794) Co-authored-by: Ayaan Zaidi <zaidi@uplause.io>

shakkernerd and others added 30 commits March 5, 2026 06:37

chore(pr): enforce changelog placement and reduce merge sync churn

60849f3

TTS: add baseUrl support to OpenAI TTS config (openclaw#34321)

2c8ee59

Merged via squash. Prepared head SHA: e9a10cf Co-authored-by: RealKai42 <44634134+RealKai42@users.noreply.github.com> Co-authored-by: shakkernerd <165377636+shakkernerd@users.noreply.github.com> Reviewed-by: @shakkernerd

docs(telegram): recommend allowlist for single-user DM policy (opencl…

c522154

…aw#34841) * docs(telegram): recommend allowlist for single-user bots * docs(telegram): condense single-user allowlist note --------- Co-authored-by: echoVic <echovic@163.com>

fix(feishu): use probed botName for mention checks (openclaw#36391)

b9f3f8d

Feishu: honor bot mentions by ID despite aliases (Fixes openclaw#36317)…

627b37e

… (openclaw#36333)

Mattermost: switch plugin-sdk imports to scoped subpaths (openclaw#36480

89b303c

) Verified: - pnpm build - pnpm check - pnpm test:macmini Co-authored-by: Takhoffman <781889+Takhoffman@users.noreply.github.com> Co-authored-by: Tak Hoffman <781889+Takhoffman@users.noreply.github.com>

Gateway: add SecretRef support for gateway.auth.token with auth-mode …

72cf925

…guardrails (openclaw#35094)

Fix: queue embedded runs with global-first order for group lanes

4f7bf89

Fix: unblock interrupted Telegram session lanes

d93b2a0

Fix: recover session orphan branches without losing context

5d761bc

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: Recover orphaned session context branch on missing parentId#7

Fix: Recover orphaned session context branch on missing parentId#7
Octane0411 wants to merge 81 commits intomainfrom
fix/issue-39609-session-context

Octane0411 commented Mar 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Conversation

Octane0411 commented Mar 8, 2026

Summary

Security Impact

Repro+Verification

Testing

AI Assisted

Fixes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants