fix(session): preserve lastAccountId and lastThreadId on session reset#44773
Merged
obviyus merged 2 commits intoopenclaw:mainfrom Mar 13, 2026
Merged
fix(session): preserve lastAccountId and lastThreadId on session reset#44773obviyus merged 2 commits intoopenclaw:mainfrom
lastAccountId and lastThreadId on session reset#44773obviyus merged 2 commits intoopenclaw:mainfrom
Conversation
Contributor
Greptile SummaryThis PR fixes a bug in
Confidence Score: 4/5
Prompt To Fix All With AIThis is a comment left during a code review.
Path: src/gateway/session-reset-service.ts
Line: 341-342
Comment:
**No unit test covers the preserved fields after reset**
The fix is correct and symmetric with `lastChannel`/`lastTo`, but no test was added to verify that `lastAccountId` and `lastThreadId` survive a `performGatewaySessionReset` call. The existing test suite mocks out `performGatewaySessionReset` entirely (`agent.test.ts`) and the sessions integration test (`server.sessions.gateway-server-sessions-a.test.ts`) doesn't exercise the reset path with these fields set.
Consider adding a test that:
1. Seeds a session store entry with `lastAccountId` and `lastThreadId` populated.
2. Calls `performGatewaySessionReset`.
3. Asserts both fields are present and equal on the returned `entry`.
How can I resolve this? If you propose a fix, please make it concise.Last reviewed commit: 4166db7 |
![greptile-apps[bot]](proxy.php?url=https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
Comment on lines
+341
to
+342
| lastAccountId: currentEntry?.lastAccountId, | ||
| lastThreadId: currentEntry?.lastThreadId, |
Contributor
There was a problem hiding this comment.
No unit test covers the preserved fields after reset
The fix is correct and symmetric with lastChannel/lastTo, but no test was added to verify that lastAccountId and lastThreadId survive a performGatewaySessionReset call. The existing test suite mocks out performGatewaySessionReset entirely (agent.test.ts) and the sessions integration test (server.sessions.gateway-server-sessions-a.test.ts) doesn't exercise the reset path with these fields set.
Consider adding a test that:
- Seeds a session store entry with
lastAccountIdandlastThreadIdpopulated. - Calls
performGatewaySessionReset. - Asserts both fields are present and equal on the returned
entry.
Prompt To Fix With AI
This is a comment left during a code review.
Path: src/gateway/session-reset-service.ts
Line: 341-342
Comment:
**No unit test covers the preserved fields after reset**
The fix is correct and symmetric with `lastChannel`/`lastTo`, but no test was added to verify that `lastAccountId` and `lastThreadId` survive a `performGatewaySessionReset` call. The existing test suite mocks out `performGatewaySessionReset` entirely (`agent.test.ts`) and the sessions integration test (`server.sessions.gateway-server-sessions-a.test.ts`) doesn't exercise the reset path with these fields set.
Consider adding a test that:
1. Seeds a session store entry with `lastAccountId` and `lastThreadId` populated.
2. Calls `performGatewaySessionReset`.
3. Asserts both fields are present and equal on the returned `entry`.
How can I resolve this? If you propose a fix, please make it concise.
Contributor
Author
obviyus
force-pushed
the
fix/session-reset-account-id
branch
from
4166db7 to
22947a4
Compare
Contributor
frankekn
pushed a commit
that referenced
this pull request
Mar 13, 2026
frankekn
pushed a commit
to jmcte/openclaw
that referenced
this pull request
Mar 13, 2026
Jerry-Xin
pushed a commit
to Jerry-Xin/openclaw
that referenced
this pull request
Mar 13, 2026
ecochran76
pushed a commit
to ecochran76/openclaw
that referenced
this pull request
Mar 14, 2026
5 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
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.
Summary
performGatewaySessionResetomittedlastAccountIdandlastThreadIdwhen constructingnextEntry, causing both fields to be lost after a session reset.lastAccountIdandlastThreadIdto thenextEntryconstruction insession-reset-service.ts, consistent with howlastChannelandlastToare already handled.Change Type
Scope
Linked Issue/PR
User-visible / Behavior Changes
After a session reset,
lastAccountIdandlastThreadIdare now correctly preserved, restoring proper message routing behavior.Security Impact
Repro + Verification
Environment
Steps
lastAccountId/lastThreadIdset (e.g. via a Discord thread message)/resetor equivalent)Expected
Actual (before fix)
lastAccountId/lastThreadIdwere cleared on reset, causing routing failure or lost repliesEvidence
Human Verification
nextEntrycurrentEntrybeingundefinedis handled safely via optional chainingReview Conversations
Compatibility / Migration
Failure Recovery
git revertthis commitsrc/gateway/session-reset-service.tsRisks and Mitigations
None