mirror of
https://github.com/farcasclaudiu/openclaw.git
synced 2026-06-28 23:02:02 +03:00
fix(discord): Apply historyLimit to channel/group sessions to prevent compaction bypass (openclaw#11356) thanks @shadril238
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:
committed by
GitHub
parent
ec4da3aca9
commit
5378583da1
@@ -17,6 +17,7 @@ Docs: https://docs.openclaw.ai
|
|||||||
- CLI: lazily load outbound provider dependencies and remove forced success-path exits so commands terminate naturally without killing intentional long-running foreground actions. (#12906) Thanks @DrCrinkle.
|
- CLI: lazily load outbound provider dependencies and remove forced success-path exits so commands terminate naturally without killing intentional long-running foreground actions. (#12906) Thanks @DrCrinkle.
|
||||||
- Clawdock: avoid Zsh readonly variable collisions in helper scripts. (#15501) Thanks @nkelner.
|
- Clawdock: avoid Zsh readonly variable collisions in helper scripts. (#15501) Thanks @nkelner.
|
||||||
- Discord: route autoThread replies to existing threads instead of the root channel. (#8302) Thanks @gavinbmoore, @thewilloftheshadow.
|
- Discord: route autoThread replies to existing threads instead of the root channel. (#8302) Thanks @gavinbmoore, @thewilloftheshadow.
|
||||||
|
- Discord/Agents: apply channel/group `historyLimit` during embedded-runner history compaction to prevent long-running channel sessions from bypassing truncation and overflowing context windows. (#11224) Thanks @shadril238.
|
||||||
- Agents/Image tool: cap image-analysis completion `maxTokens` by model capability (`min(4096, model.maxTokens)`) to avoid over-limit provider failures while still preventing truncation. (#11770) Thanks @detecti1.
|
- Agents/Image tool: cap image-analysis completion `maxTokens` by model capability (`min(4096, model.maxTokens)`) to avoid over-limit provider failures while still preventing truncation. (#11770) Thanks @detecti1.
|
||||||
- TUI/Streaming: preserve richer streamed assistant text when final payload drops pre-tool-call text blocks, while keeping non-empty final payload authoritative for plain-text updates. (#15452) Thanks @TsekaLuk.
|
- TUI/Streaming: preserve richer streamed assistant text when final payload drops pre-tool-call text blocks, while keeping non-empty final payload authoritative for plain-text updates. (#15452) Thanks @TsekaLuk.
|
||||||
- Inbound/Web UI: preserve literal `\n` sequences when normalizing inbound text so Windows paths like `C:\\Work\\nxxx\\README.md` are not corrupted. (#11547) Thanks @mcaxtr.
|
- Inbound/Web UI: preserve literal `\n` sequences when normalizing inbound text so Windows paths like `C:\\Work\\nxxx\\README.md` are not corrupted. (#11547) Thanks @mcaxtr.
|
||||||
|
|||||||
+53
-4
@@ -143,14 +143,23 @@ describe("getDmHistoryLimitFromSessionKey", () => {
|
|||||||
9,
|
9,
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
it("returns undefined for non-dm session kinds", () => {
|
it("returns historyLimit for channel session kinds when configured", () => {
|
||||||
const config = {
|
const config = {
|
||||||
channels: {
|
channels: {
|
||||||
telegram: { dmHistoryLimit: 15 },
|
slack: { historyLimit: 10, dmHistoryLimit: 15 },
|
||||||
slack: { dmHistoryLimit: 10 },
|
discord: { historyLimit: 8 },
|
||||||
},
|
},
|
||||||
} as OpenClawConfig;
|
} as OpenClawConfig;
|
||||||
expect(getDmHistoryLimitFromSessionKey("agent:beta:slack:channel:c1", config)).toBeUndefined();
|
expect(getDmHistoryLimitFromSessionKey("agent:beta:slack:channel:c1", config)).toBe(10);
|
||||||
|
expect(getDmHistoryLimitFromSessionKey("discord:channel:123456", config)).toBe(8);
|
||||||
|
});
|
||||||
|
it("returns undefined for non-dm/channel/group session kinds", () => {
|
||||||
|
const config = {
|
||||||
|
channels: {
|
||||||
|
telegram: { dmHistoryLimit: 15, historyLimit: 10 },
|
||||||
|
},
|
||||||
|
} as OpenClawConfig;
|
||||||
|
// "slash" is not dm, channel, or group
|
||||||
expect(getDmHistoryLimitFromSessionKey("telegram:slash:123", config)).toBeUndefined();
|
expect(getDmHistoryLimitFromSessionKey("telegram:slash:123", config)).toBeUndefined();
|
||||||
});
|
});
|
||||||
it("returns undefined for unknown provider", () => {
|
it("returns undefined for unknown provider", () => {
|
||||||
@@ -228,6 +237,46 @@ describe("getDmHistoryLimitFromSessionKey", () => {
|
|||||||
} as OpenClawConfig;
|
} as OpenClawConfig;
|
||||||
expect(getDmHistoryLimitFromSessionKey("telegram:dm:123", config)).toBe(5);
|
expect(getDmHistoryLimitFromSessionKey("telegram:dm:123", config)).toBe(5);
|
||||||
});
|
});
|
||||||
|
it("returns historyLimit for channel sessions for all providers", () => {
|
||||||
|
const providers = [
|
||||||
|
"telegram",
|
||||||
|
"whatsapp",
|
||||||
|
"discord",
|
||||||
|
"slack",
|
||||||
|
"signal",
|
||||||
|
"imessage",
|
||||||
|
"msteams",
|
||||||
|
"nextcloud-talk",
|
||||||
|
] as const;
|
||||||
|
|
||||||
|
for (const provider of providers) {
|
||||||
|
const config = {
|
||||||
|
channels: { [provider]: { historyLimit: 12 } },
|
||||||
|
} as OpenClawConfig;
|
||||||
|
expect(getDmHistoryLimitFromSessionKey(`${provider}:channel:123`, config)).toBe(12);
|
||||||
|
expect(getDmHistoryLimitFromSessionKey(`agent:main:${provider}:channel:456`, config)).toBe(
|
||||||
|
12,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
it("returns historyLimit for group sessions", () => {
|
||||||
|
const config = {
|
||||||
|
channels: {
|
||||||
|
discord: { historyLimit: 15 },
|
||||||
|
slack: { historyLimit: 10 },
|
||||||
|
},
|
||||||
|
} as OpenClawConfig;
|
||||||
|
expect(getDmHistoryLimitFromSessionKey("discord:group:123", config)).toBe(15);
|
||||||
|
expect(getDmHistoryLimitFromSessionKey("agent:main:slack:group:abc", config)).toBe(10);
|
||||||
|
});
|
||||||
|
it("returns undefined for channel sessions when historyLimit is not configured", () => {
|
||||||
|
const config = {
|
||||||
|
channels: {
|
||||||
|
discord: { dmHistoryLimit: 10 }, // only dmHistoryLimit, no historyLimit
|
||||||
|
},
|
||||||
|
} as OpenClawConfig;
|
||||||
|
expect(getDmHistoryLimitFromSessionKey("discord:channel:123", config)).toBeUndefined();
|
||||||
|
});
|
||||||
|
|
||||||
describe("backward compatibility", () => {
|
describe("backward compatibility", () => {
|
||||||
it("accepts both legacy :dm: and new :direct: session keys", () => {
|
it("accepts both legacy :dm: and new :direct: session keys", () => {
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
import { describe, expect, it } from "vitest";
|
||||||
|
import type { OpenClawConfig } from "../config/config.js";
|
||||||
|
import { getDmHistoryLimitFromSessionKey } from "./pi-embedded-runner.js";
|
||||||
|
|
||||||
|
describe("getDmHistoryLimitFromSessionKey", () => {
|
||||||
|
it("keeps backward compatibility for dm/direct session kinds", () => {
|
||||||
|
const config = {
|
||||||
|
channels: { telegram: { dmHistoryLimit: 10 } },
|
||||||
|
} as OpenClawConfig;
|
||||||
|
|
||||||
|
expect(getDmHistoryLimitFromSessionKey("telegram:dm:123", config)).toBe(10);
|
||||||
|
expect(getDmHistoryLimitFromSessionKey("telegram:direct:123", config)).toBe(10);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns historyLimit for channel and group session kinds", () => {
|
||||||
|
const config = {
|
||||||
|
channels: { discord: { historyLimit: 12, dmHistoryLimit: 5 } },
|
||||||
|
} as OpenClawConfig;
|
||||||
|
|
||||||
|
expect(getDmHistoryLimitFromSessionKey("discord:channel:123", config)).toBe(12);
|
||||||
|
expect(getDmHistoryLimitFromSessionKey("discord:group:456", config)).toBe(12);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns undefined for unsupported session kinds", () => {
|
||||||
|
const config = {
|
||||||
|
channels: { discord: { historyLimit: 12, dmHistoryLimit: 5 } },
|
||||||
|
} as OpenClawConfig;
|
||||||
|
|
||||||
|
expect(getDmHistoryLimitFromSessionKey("discord:slash:123", config)).toBeUndefined();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -5,6 +5,7 @@ export { applyExtraParamsToAgent, resolveExtraParams } from "./pi-embedded-runne
|
|||||||
export { applyGoogleTurnOrderingFix } from "./pi-embedded-runner/google.js";
|
export { applyGoogleTurnOrderingFix } from "./pi-embedded-runner/google.js";
|
||||||
export {
|
export {
|
||||||
getDmHistoryLimitFromSessionKey,
|
getDmHistoryLimitFromSessionKey,
|
||||||
|
getHistoryLimitFromSessionKey,
|
||||||
limitHistoryTurns,
|
limitHistoryTurns,
|
||||||
} from "./pi-embedded-runner/history.js";
|
} from "./pi-embedded-runner/history.js";
|
||||||
export { resolveEmbeddedSessionLane } from "./pi-embedded-runner/lanes.js";
|
export { resolveEmbeddedSessionLane } from "./pi-embedded-runner/lanes.js";
|
||||||
|
|||||||
@@ -38,8 +38,9 @@ export function limitHistoryTurns(
|
|||||||
/**
|
/**
|
||||||
* Extract provider + user ID from a session key and look up dmHistoryLimit.
|
* Extract provider + user ID from a session key and look up dmHistoryLimit.
|
||||||
* Supports per-DM overrides and provider defaults.
|
* 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,
|
sessionKey: string | undefined,
|
||||||
config: OpenClawConfig | undefined,
|
config: OpenClawConfig | undefined,
|
||||||
): number | undefined {
|
): number | undefined {
|
||||||
@@ -58,32 +59,17 @@ export function getDmHistoryLimitFromSessionKey(
|
|||||||
const kind = providerParts[1]?.toLowerCase();
|
const kind = providerParts[1]?.toLowerCase();
|
||||||
const userIdRaw = providerParts.slice(2).join(":");
|
const userIdRaw = providerParts.slice(2).join(":");
|
||||||
const userId = stripThreadSuffix(userIdRaw);
|
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 = (
|
const resolveProviderConfig = (
|
||||||
cfg: OpenClawConfig | undefined,
|
cfg: OpenClawConfig | undefined,
|
||||||
providerId: string,
|
providerId: string,
|
||||||
): { dmHistoryLimit?: number; dms?: Record<string, { historyLimit?: number }> } | undefined => {
|
):
|
||||||
|
| {
|
||||||
|
historyLimit?: number;
|
||||||
|
dmHistoryLimit?: number;
|
||||||
|
dms?: Record<string, { historyLimit?: number }>;
|
||||||
|
}
|
||||||
|
| undefined => {
|
||||||
const channels = cfg?.channels;
|
const channels = cfg?.channels;
|
||||||
if (!channels || typeof channels !== "object") {
|
if (!channels || typeof channels !== "object") {
|
||||||
return undefined;
|
return undefined;
|
||||||
@@ -92,8 +78,38 @@ export function getDmHistoryLimitFromSessionKey(
|
|||||||
if (!entry || typeof entry !== "object" || Array.isArray(entry)) {
|
if (!entry || typeof entry !== "object" || Array.isArray(entry)) {
|
||||||
return undefined;
|
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;
|
||||||
|
|||||||
Reference in New Issue
Block a user