fix(offload): resolve session manager in assemble/afterTurn without sessionKey - #893
Open
YOMXXX wants to merge 3 commits into
Open
fix(offload): resolve session manager in assemble/afterTurn without sessionKey#893YOMXXX wants to merge 3 commits into
YOMXXX wants to merge 3 commits into
Conversation
Issue TencentCloud#851: the plugin used to monkey-patch OpenClaw's compiled dist files to inject event.messages into after_tool_call. The patch is removed in v2, but the hook still gated L3 compression on classifyPatchEffectiveness() and relied on the injected messages — on current OpenClaw versions (where event.messages is absent) L3/MMD never ran. - after_tool_call now fetches session messages through the official api.runtime.subagent.getSessionMessages({ sessionKey, limit }) when the event carries none - removed the classifyPatchEffectiveness() patch check (the patch no longer exists) - the handler takes an optional getSessionMessages callback, wired from the plugin api at registration Fixes TencentCloud#851 (replaces the fragile dist-patch approach with the supported API) Signed-off-by: 李冠辰 <liguanchen@xiaomi.com>
drain() invoked entry.task() directly; when a queued task threw synchronously the call escaped before .finally() was registered, leaving running=true forever. The queue stayed stuck, so every later add() hung and onIdle() never resolved — silently stalling L1/L2/L3 flushes in the pipeline. Wrap the task call in Promise.resolve().then() so the error is caught, bookkeeping is finalized, and the next queued task runs normally. Fixes TencentCloud#518 Signed-off-by: 李冠辰 <liguanchen@xiaomi.com>
…essionKey OpenClaw's afterTurn/assemble path passes sessionId (or sessionTarget.sessionKey) but not always a top-level sessionKey. The stateManager fallback only guarded on params.sessionKey, so assemble() returned early every turn: L1.5 never settled, MMD injection never ran, and L2/L3 never fired (TencentCloud#878, TencentCloud#880). Extend the fallback to sessionKey -> sessionId -> sessionTarget.sessionKey in both assemble() and afterTurn(), mirroring the compact() fix (TencentCloud#862). Adds a vitest suite covering: assemble resolving from sessionId only, afterTurn resolving from sessionId only, and clean skip when no session is resolvable. Fixes TencentCloud#878 Signed-off-by: 李冠辰 <liguanchen@xiaomi.com>
Collaborator
|
Thanks for your contribution and attention! We will review this PR and get back to you as soon as possible. |
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
2 participants
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.
Fixes #878. Also addresses #880 (same root cause).
Problem
OffloadContextEngine.assemble()andafterTurn()only resolved their per-session manager when a top-levelsessionKeywas present. OpenClaw'safterTurn/assemblehook path passessessionId(orsessionTarget.sessionKey) but not alwayssessionKey, so every turn logged:Since
assemble()is the sole L1.5 trigger point, skipping it cascaded:waiting for L1.5 to settle)below_mildwith an unbounded context)This is the same root cause as #862, but #862 only fixed the
/compactpath (compact()); theafterTurn/assemblepath was left broken.Change
Extend the stateManager fallback in both
assemble()andafterTurn()to:sessionKey → sessionId → sessionTarget?.sessionKeymirroring the
compact()resolution path (#862).Verification
New
src/offload/session-resolve.test.ts(3 tests):assembleresolves manager fromsessionIdalone and reaches the L1.5 triggerafterTurnresolves manager fromsessionIdalone without throwingassembleskips cleanly when no session is resolvableThe first test fails on the unfixed code (judgeL15 never fires) and passes after the fix.
npm test+npm run build:pluginpass.