refactor: move dmHistoryLimit to provider-level config

This commit is contained in:
Marc Terns
2026-01-11 08:38:19 -06:00
parent a005a97fef
commit ab9ea827a4
4 changed files with 132 additions and 4 deletions

View File

@@ -11,6 +11,7 @@ import {
applyGoogleTurnOrderingFix,
buildEmbeddedSandboxInfo,
createSystemPromptOverride,
getDmHistoryLimitFromSessionKey,
limitHistoryTurns,
runEmbeddedPiAgent,
splitSdkTools,
@@ -370,6 +371,68 @@ describe("limitHistoryTurns", () => {
});
});
describe("getDmHistoryLimitFromSessionKey", () => {
it("returns undefined when sessionKey is undefined", () => {
expect(getDmHistoryLimitFromSessionKey(undefined, {})).toBeUndefined();
});
it("returns undefined when config is undefined", () => {
expect(
getDmHistoryLimitFromSessionKey("telegram:dm:123", undefined),
).toBeUndefined();
});
it("returns dmHistoryLimit for telegram provider", () => {
const config = { telegram: { dmHistoryLimit: 15 } } as ClawdbotConfig;
expect(getDmHistoryLimitFromSessionKey("telegram:dm:123", config)).toBe(15);
});
it("returns dmHistoryLimit for whatsapp provider", () => {
const config = { whatsapp: { dmHistoryLimit: 20 } } as ClawdbotConfig;
expect(getDmHistoryLimitFromSessionKey("whatsapp:dm:123", config)).toBe(20);
});
it("returns dmHistoryLimit for agent-prefixed session keys", () => {
const config = { telegram: { dmHistoryLimit: 10 } } as ClawdbotConfig;
expect(
getDmHistoryLimitFromSessionKey("agent:main:telegram:dm:123", config),
).toBe(10);
});
it("returns undefined for unknown provider", () => {
const config = { telegram: { dmHistoryLimit: 15 } } as ClawdbotConfig;
expect(
getDmHistoryLimitFromSessionKey("unknown:dm:123", config),
).toBeUndefined();
});
it("returns undefined when provider config has no dmHistoryLimit", () => {
const config = { telegram: {} } as ClawdbotConfig;
expect(
getDmHistoryLimitFromSessionKey("telegram:dm:123", config),
).toBeUndefined();
});
it("handles all supported providers", () => {
const providers = [
"telegram",
"whatsapp",
"discord",
"slack",
"signal",
"imessage",
"msteams",
] as const;
for (const provider of providers) {
const config = { [provider]: { dmHistoryLimit: 5 } } as ClawdbotConfig;
expect(
getDmHistoryLimitFromSessionKey(`${provider}:dm:123`, config),
).toBe(5);
}
});
});
describe("runEmbeddedPiAgent", () => {
it("writes models.json into the provided agentDir", async () => {
const agentDir = await fs.mkdtemp(

View File

@@ -445,6 +445,49 @@ export function limitHistoryTurns(
return messages;
}
/**
* Extracts the provider name from a session key and looks up dmHistoryLimit
* from the provider config.
*
* Session key formats:
* - `telegram:dm:123` → provider = telegram
* - `agent:main:telegram:dm:123` → provider = telegram (skip "agent:<id>:")
*/
export function getDmHistoryLimitFromSessionKey(
sessionKey: string | undefined,
config: ClawdbotConfig | undefined,
): number | undefined {
if (!sessionKey || !config) return undefined;
const parts = sessionKey.split(":").filter(Boolean);
// Handle agent-prefixed keys: agent:<agentId>:<provider>:...
const providerParts =
parts.length >= 3 && parts[0] === "agent" ? parts.slice(2) : parts;
const provider = providerParts[0]?.toLowerCase();
if (!provider) return undefined;
// Map provider to config key
switch (provider) {
case "telegram":
return config.telegram?.dmHistoryLimit;
case "whatsapp":
return config.whatsapp?.dmHistoryLimit;
case "discord":
return config.discord?.dmHistoryLimit;
case "slack":
return config.slack?.dmHistoryLimit;
case "signal":
return config.signal?.dmHistoryLimit;
case "imessage":
return config.imessage?.dmHistoryLimit;
case "msteams":
return config.msteams?.dmHistoryLimit;
default:
return undefined;
}
}
const ACTIVE_EMBEDDED_RUNS = new Map<string, EmbeddedPiQueueHandle>();
type EmbeddedRunWaiter = {
resolve: (ended: boolean) => void;
@@ -1060,7 +1103,7 @@ export async function compactEmbeddedPiSession(params: {
const validated = validateGeminiTurns(prior);
const limited = limitHistoryTurns(
validated,
params.config?.session?.dmHistoryLimit,
getDmHistoryLimitFromSessionKey(params.sessionKey, params.config),
);
if (limited.length > 0) {
session.agent.replaceMessages(limited);
@@ -1455,7 +1498,7 @@ export async function runEmbeddedPiAgent(params: {
const validated = validateGeminiTurns(prior);
const limited = limitHistoryTurns(
validated,
params.config?.session?.dmHistoryLimit,
getDmHistoryLimitFromSessionKey(params.sessionKey, params.config),
);
if (limited.length > 0) {
session.agent.replaceMessages(limited);