vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-30 23:00:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(sessions): harden session id resolution

Browse Source
This commit is contained in:
Peter Steinberger
2026-04-03 20:28:52 +09:00
parent 1337be3063
commit 1dd88c6288
5 changed files with 207 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/agents/command/session.ts
View File

@@ -76,16 +76,21 @@ export function resolveSessionKeyForRequest(opts: {
(!sessionKey || sessionStore[sessionKey]?.sessionId !== opts.sessionId)
) {
const matches: Array<[string, SessionEntry]> = [];
const primaryStoreMatches: Array<[string, SessionEntry]> = [];
const storeByKey = new Map<string, SessionKeyResolution>();
const addMatches = (
candidateStore: Record<string, SessionEntry>,
candidateStorePath: string,
options?: { primary?: boolean },
): void => {
for (const [candidateKey, candidateEntry] of Object.entries(candidateStore)) {
if (candidateEntry?.sessionId !== opts.sessionId) {
continue;
}
matches.push([candidateKey, candidateEntry]);
if (options?.primary) {
primaryStoreMatches.push([candidateKey, candidateEntry]);
}
storeByKey.set(candidateKey, {
sessionKey: candidateKey,
sessionStore: candidateStore,
@@ -94,7 +99,7 @@ export function resolveSessionKeyForRequest(opts: {
}
};
addMatches(sessionStore, storePath);
addMatches(sessionStore, storePath, { primary: true });
const allAgentIds = listAgentIds(opts.cfg);
for (const agentId of allAgentIds) {
if (agentId === storeAgentId) {
@@ -106,12 +111,15 @@ export function resolveSessionKeyForRequest(opts: {
}
const preferredKey = resolvePreferredSessionKeyForSessionIdMatches(matches, opts.sessionId);
if (preferredKey) {
const preferred = storeByKey.get(preferredKey);
const currentStorePreferredKey =
preferredKey ??
resolvePreferredSessionKeyForSessionIdMatches(primaryStoreMatches, opts.sessionId);
if (currentStorePreferredKey) {
const preferred = storeByKey.get(currentStorePreferredKey);
if (preferred) {
return preferred;
}
sessionKey = preferredKey;
sessionKey = currentStorePreferredKey;
}
}