github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-08 02:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(discord): Apply historyLimit to channel/group sessions to prevent compaction bypass (openclaw#11356) thanks @shadril238

Browse Source 
Verified:
- pnpm build
- pnpm check
- pnpm test (ran; one unrelated existing failure in models forward-compat test)
- pnpm vitest src/agents/pi-embedded-runner.history-limit-from-session-key.test.ts

Co-authored-by: shadril238 <63901551+shadril238@users.noreply.github.com>
Co-authored-by: Tak Hoffman <781889+Takhoffman@users.noreply.github.com>
This commit is contained in:
Shadril Hassan Shifat
2026-02-14 06:18:57 +06:00
committed by GitHub
parent ec4da3aca9
commit 5378583da1
5 changed files with 127 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/agents/pi-embedded-runner/history.ts
View File

@@ -38,8 +38,9 @@ export function limitHistoryTurns(
/**
* Extract provider + user ID from a session key and look up dmHistoryLimit.
* Supports per-DM overrides and provider defaults.
* For channel/group sessions, uses historyLimit from provider config.
*/
export function getDmHistoryLimitFromSessionKey(
export function getHistoryLimitFromSessionKey(
sessionKey: string | undefined,
config: OpenClawConfig | undefined,
): number | undefined {
@@ -58,32 +59,17 @@ export function getDmHistoryLimitFromSessionKey(
const kind = providerParts[1]?.toLowerCase();
const userIdRaw = providerParts.slice(2).join(":");
const userId = stripThreadSuffix(userIdRaw);
// Accept both "direct" (new) and "dm" (legacy) for backward compat
if (kind !== "direct" && kind !== "dm") {
return undefined;
}
const getLimit = (
providerConfig:
| {
dmHistoryLimit?: number;
dms?: Record<string, { historyLimit?: number }>;
}
| undefined,
): number | undefined => {
if (!providerConfig) {
return undefined;
}
if (userId && providerConfig.dms?.[userId]?.historyLimit !== undefined) {
return providerConfig.dms[userId].historyLimit;
}
return providerConfig.dmHistoryLimit;
};
const resolveProviderConfig = (
cfg: OpenClawConfig | undefined,
providerId: string,
): { dmHistoryLimit?: number; dms?: Record<string, { historyLimit?: number }> } | undefined => {
):
| {
historyLimit?: number;
dmHistoryLimit?: number;
dms?: Record<string, { historyLimit?: number }>;
}
| undefined => {
const channels = cfg?.channels;
if (!channels || typeof channels !== "object") {
return undefined;
@@ -92,8 +78,38 @@ export function getDmHistoryLimitFromSessionKey(
if (!entry || typeof entry !== "object" || Array.isArray(entry)) {
return undefined;
}
return entry as { dmHistoryLimit?: number; dms?: Record<string, { historyLimit?: number }> };
return entry as {
historyLimit?: number;
dmHistoryLimit?: number;
dms?: Record<string, { historyLimit?: number }>;
};
};
return getLimit(resolveProviderConfig(config, provider));
const providerConfig = resolveProviderConfig(config, provider);
if (!providerConfig) {
return undefined;
}
// For DM sessions: per-DM override -> dmHistoryLimit.
// Accept both "direct" (new) and "dm" (legacy) for backward compat.
if (kind === "dm" || kind === "direct") {
if (userId && providerConfig.dms?.[userId]?.historyLimit !== undefined) {
return providerConfig.dms[userId].historyLimit;
}
return providerConfig.dmHistoryLimit;
}
// For channel/group sessions: use historyLimit from provider config
// This prevents context overflow in long-running channel sessions
if (kind === "channel" || kind === "group") {
return providerConfig.historyLimit;
}
return undefined;
}
/**
* @deprecated Use getHistoryLimitFromSessionKey instead.
* Alias for backward compatibility.
*/
export const getDmHistoryLimitFromSessionKey = getHistoryLimitFromSessionKey;