* fix(gateway): normalize session key casing to prevent ghost sessions on Linux On case-sensitive filesystems (Linux), mixed-case session keys like agent:ops:MySession and agent:ops:mysession resolve to different store entries, creating ghost duplicates that never converge. Core changes in session-utils.ts: - resolveSessionStoreKey: lowercase all session key components - canonicalizeSpawnedByForAgent: accept cfg, resolve main-alias references via canonicalizeMainSessionAlias after lowercasing - loadSessionEntry: return legacyKey only when it differs from canonicalKey - resolveGatewaySessionStoreTarget: scan store for case-insensitive matches; add optional scanLegacyKeys param to skip disk reads for read-only callers - Export findStoreKeysIgnoreCase for use by write-path consumers - Compare global/unknown sentinels case-insensitively in all canonicalization functions sessions-resolve.ts: - Make resolveSessionKeyFromResolveParams async for inline migration - Check canonical key first (fast path), then fall back to legacy scan - Delete ALL legacy case-variant keys in a single updateSessionStore pass Fixes #12603 * fix(gateway): propagate canonical keys and clean up all case variants on write paths - agent.ts: use canonicalizeSpawnedByForAgent (with cfg) instead of raw toLowerCase; use findStoreKeysIgnoreCase to delete all legacy variants on store write; pass canonicalKey to addChatRun, registerAgentRunContext, resolveSendPolicy, and agentCommand - sessions.ts: replace single-key migration with full case-variant cleanup via findStoreKeysIgnoreCase in patch/reset/delete/compact handlers; add case-insensitive fallback in preview (store already loaded); make sessions.resolve handler async; pass scanLegacyKeys: false in preview - server-node-events.ts: use findStoreKeysIgnoreCase to clean all legacy variants on voice.transcript and agent.request write paths; pass canonicalKey to addChatRun and agentCommand * test(gateway): add session key case-normalization tests Cover the case-insensitive session key canonicalization logic: - resolveSessionStoreKey normalizes mixed-case bare and prefixed keys - resolveSessionStoreKey resolves mixed-case main aliases (MAIN, Main) - resolveGatewaySessionStoreTarget includes legacy mixed-case store keys - resolveGatewaySessionStoreTarget collects all case-variant duplicates - resolveGatewaySessionStoreTarget finds legacy main alias keys with customized mainKey configuration All 5 tests fail before the production changes, pass after. * fix: clean legacy session alias cleanup gaps (openclaw#12846) thanks @mcaxtr --------- Co-authored-by: Peter Steinberger <steipete@gmail.com>
153 lines
4.6 KiB
TypeScript
153 lines
4.6 KiB
TypeScript
import type { OpenClawConfig } from "../config/config.js";
|
|
import { loadSessionStore, updateSessionStore } from "../config/sessions.js";
|
|
import { parseSessionLabel } from "../sessions/session-label.js";
|
|
import {
|
|
ErrorCodes,
|
|
type ErrorShape,
|
|
errorShape,
|
|
type SessionsResolveParams,
|
|
} from "./protocol/index.js";
|
|
import {
|
|
listSessionsFromStore,
|
|
loadCombinedSessionStoreForGateway,
|
|
pruneLegacyStoreKeys,
|
|
resolveGatewaySessionStoreTarget,
|
|
} from "./session-utils.js";
|
|
|
|
export type SessionsResolveResult = { ok: true; key: string } | { ok: false; error: ErrorShape };
|
|
|
|
export async function resolveSessionKeyFromResolveParams(params: {
|
|
cfg: OpenClawConfig;
|
|
p: SessionsResolveParams;
|
|
}): Promise<SessionsResolveResult> {
|
|
const { cfg, p } = params;
|
|
|
|
const key = typeof p.key === "string" ? p.key.trim() : "";
|
|
const hasKey = key.length > 0;
|
|
const sessionId = typeof p.sessionId === "string" ? p.sessionId.trim() : "";
|
|
const hasSessionId = sessionId.length > 0;
|
|
const hasLabel = typeof p.label === "string" && p.label.trim().length > 0;
|
|
const selectionCount = [hasKey, hasSessionId, hasLabel].filter(Boolean).length;
|
|
if (selectionCount > 1) {
|
|
return {
|
|
ok: false,
|
|
error: errorShape(
|
|
ErrorCodes.INVALID_REQUEST,
|
|
"Provide either key, sessionId, or label (not multiple)",
|
|
),
|
|
};
|
|
}
|
|
if (selectionCount === 0) {
|
|
return {
|
|
ok: false,
|
|
error: errorShape(ErrorCodes.INVALID_REQUEST, "Either key, sessionId, or label is required"),
|
|
};
|
|
}
|
|
|
|
if (hasKey) {
|
|
const target = resolveGatewaySessionStoreTarget({ cfg, key });
|
|
const store = loadSessionStore(target.storePath);
|
|
if (store[target.canonicalKey]) {
|
|
return { ok: true, key: target.canonicalKey };
|
|
}
|
|
const legacyKey = target.storeKeys.find((candidate) => store[candidate]);
|
|
if (!legacyKey) {
|
|
return {
|
|
ok: false,
|
|
error: errorShape(ErrorCodes.INVALID_REQUEST, `No session found: ${key}`),
|
|
};
|
|
}
|
|
await updateSessionStore(target.storePath, (s) => {
|
|
const liveTarget = resolveGatewaySessionStoreTarget({ cfg, key, store: s });
|
|
const canonicalKey = liveTarget.canonicalKey;
|
|
// Migrate the first legacy entry to the canonical key.
|
|
if (!s[canonicalKey] && s[legacyKey]) {
|
|
s[canonicalKey] = s[legacyKey];
|
|
}
|
|
pruneLegacyStoreKeys({ store: s, canonicalKey, candidates: liveTarget.storeKeys });
|
|
});
|
|
return { ok: true, key: target.canonicalKey };
|
|
}
|
|
|
|
if (hasSessionId) {
|
|
const { storePath, store } = loadCombinedSessionStoreForGateway(cfg);
|
|
const list = listSessionsFromStore({
|
|
cfg,
|
|
storePath,
|
|
store,
|
|
opts: {
|
|
includeGlobal: p.includeGlobal === true,
|
|
includeUnknown: p.includeUnknown === true,
|
|
spawnedBy: p.spawnedBy,
|
|
agentId: p.agentId,
|
|
search: sessionId,
|
|
limit: 8,
|
|
},
|
|
});
|
|
const matches = list.sessions.filter(
|
|
(session) => session.sessionId === sessionId || session.key === sessionId,
|
|
);
|
|
if (matches.length === 0) {
|
|
return {
|
|
ok: false,
|
|
error: errorShape(ErrorCodes.INVALID_REQUEST, `No session found: ${sessionId}`),
|
|
};
|
|
}
|
|
if (matches.length > 1) {
|
|
const keys = matches.map((session) => session.key).join(", ");
|
|
return {
|
|
ok: false,
|
|
error: errorShape(
|
|
ErrorCodes.INVALID_REQUEST,
|
|
`Multiple sessions found for sessionId: ${sessionId} (${keys})`,
|
|
),
|
|
};
|
|
}
|
|
return { ok: true, key: String(matches[0]?.key ?? "") };
|
|
}
|
|
|
|
const parsedLabel = parseSessionLabel(p.label);
|
|
if (!parsedLabel.ok) {
|
|
return {
|
|
ok: false,
|
|
error: errorShape(ErrorCodes.INVALID_REQUEST, parsedLabel.error),
|
|
};
|
|
}
|
|
|
|
const { storePath, store } = loadCombinedSessionStoreForGateway(cfg);
|
|
const list = listSessionsFromStore({
|
|
cfg,
|
|
storePath,
|
|
store,
|
|
opts: {
|
|
includeGlobal: p.includeGlobal === true,
|
|
includeUnknown: p.includeUnknown === true,
|
|
label: parsedLabel.label,
|
|
agentId: p.agentId,
|
|
spawnedBy: p.spawnedBy,
|
|
limit: 2,
|
|
},
|
|
});
|
|
if (list.sessions.length === 0) {
|
|
return {
|
|
ok: false,
|
|
error: errorShape(
|
|
ErrorCodes.INVALID_REQUEST,
|
|
`No session found with label: ${parsedLabel.label}`,
|
|
),
|
|
};
|
|
}
|
|
if (list.sessions.length > 1) {
|
|
const keys = list.sessions.map((s) => s.key).join(", ");
|
|
return {
|
|
ok: false,
|
|
error: errorShape(
|
|
ErrorCodes.INVALID_REQUEST,
|
|
`Multiple sessions found with label: ${parsedLabel.label} (${keys})`,
|
|
),
|
|
};
|
|
}
|
|
|
|
return { ok: true, key: String(list.sessions[0]?.key ?? "") };
|
|
}
|