* feat(sessions): add channelIdleMinutes config for per-channel session idle durations
Add new `channelIdleMinutes` config option to allow different session idle
timeouts per channel. For example, Discord sessions can now be configured
to last 7 days (10080 minutes) while other channels use shorter defaults.
Config example:
sessions:
channelIdleMinutes:
discord: 10080 # 7 days
The channel-specific idle is passed as idleMinutesOverride to the existing
resolveSessionResetPolicy, integrating cleanly with the new reset policy
architecture.
* fix
* feat: add per-channel session reset overrides (#1353) (thanks @cash-echo-bot)
---------
Co-authored-by: Cash Williams <cashwilliams@gmail.com>
Co-authored-by: Peter Steinberger <steipete@gmail.com>
143 lines
4.9 KiB
TypeScript
143 lines
4.9 KiB
TypeScript
import type { SessionConfig, SessionResetConfig } from "../types.base.js";
|
|
import { DEFAULT_IDLE_MINUTES } from "./types.js";
|
|
import { normalizeMessageChannel } from "../../utils/message-channel.js";
|
|
|
|
export type SessionResetMode = "daily" | "idle";
|
|
export type SessionResetType = "dm" | "group" | "thread";
|
|
|
|
export type SessionResetPolicy = {
|
|
mode: SessionResetMode;
|
|
atHour: number;
|
|
idleMinutes?: number;
|
|
};
|
|
|
|
export type SessionFreshness = {
|
|
fresh: boolean;
|
|
dailyResetAt?: number;
|
|
idleExpiresAt?: number;
|
|
};
|
|
|
|
export const DEFAULT_RESET_MODE: SessionResetMode = "daily";
|
|
export const DEFAULT_RESET_AT_HOUR = 4;
|
|
|
|
const THREAD_SESSION_MARKERS = [":thread:", ":topic:"];
|
|
const GROUP_SESSION_MARKERS = [":group:", ":channel:"];
|
|
|
|
export function isThreadSessionKey(sessionKey?: string | null): boolean {
|
|
const normalized = (sessionKey ?? "").toLowerCase();
|
|
if (!normalized) return false;
|
|
return THREAD_SESSION_MARKERS.some((marker) => normalized.includes(marker));
|
|
}
|
|
|
|
export function resolveSessionResetType(params: {
|
|
sessionKey?: string | null;
|
|
isGroup?: boolean;
|
|
isThread?: boolean;
|
|
}): SessionResetType {
|
|
if (params.isThread || isThreadSessionKey(params.sessionKey)) return "thread";
|
|
if (params.isGroup) return "group";
|
|
const normalized = (params.sessionKey ?? "").toLowerCase();
|
|
if (GROUP_SESSION_MARKERS.some((marker) => normalized.includes(marker))) return "group";
|
|
return "dm";
|
|
}
|
|
|
|
export function resolveThreadFlag(params: {
|
|
sessionKey?: string | null;
|
|
messageThreadId?: string | number | null;
|
|
threadLabel?: string | null;
|
|
threadStarterBody?: string | null;
|
|
parentSessionKey?: string | null;
|
|
}): boolean {
|
|
if (params.messageThreadId != null) return true;
|
|
if (params.threadLabel?.trim()) return true;
|
|
if (params.threadStarterBody?.trim()) return true;
|
|
if (params.parentSessionKey?.trim()) return true;
|
|
return isThreadSessionKey(params.sessionKey);
|
|
}
|
|
|
|
export function resolveDailyResetAtMs(now: number, atHour: number): number {
|
|
const normalizedAtHour = normalizeResetAtHour(atHour);
|
|
const resetAt = new Date(now);
|
|
resetAt.setHours(normalizedAtHour, 0, 0, 0);
|
|
if (now < resetAt.getTime()) {
|
|
resetAt.setDate(resetAt.getDate() - 1);
|
|
}
|
|
return resetAt.getTime();
|
|
}
|
|
|
|
export function resolveSessionResetPolicy(params: {
|
|
sessionCfg?: SessionConfig;
|
|
resetType: SessionResetType;
|
|
resetOverride?: SessionResetConfig;
|
|
}): SessionResetPolicy {
|
|
const sessionCfg = params.sessionCfg;
|
|
const baseReset = params.resetOverride ?? sessionCfg?.reset;
|
|
const typeReset = params.resetOverride ? undefined : sessionCfg?.resetByType?.[params.resetType];
|
|
const hasExplicitReset = Boolean(baseReset || sessionCfg?.resetByType);
|
|
const legacyIdleMinutes = params.resetOverride ? undefined : sessionCfg?.idleMinutes;
|
|
const mode =
|
|
typeReset?.mode ??
|
|
baseReset?.mode ??
|
|
(!hasExplicitReset && legacyIdleMinutes != null ? "idle" : DEFAULT_RESET_MODE);
|
|
const atHour = normalizeResetAtHour(
|
|
typeReset?.atHour ?? baseReset?.atHour ?? DEFAULT_RESET_AT_HOUR,
|
|
);
|
|
const idleMinutesRaw = typeReset?.idleMinutes ?? baseReset?.idleMinutes ?? legacyIdleMinutes;
|
|
|
|
let idleMinutes: number | undefined;
|
|
if (idleMinutesRaw != null) {
|
|
const normalized = Math.floor(idleMinutesRaw);
|
|
if (Number.isFinite(normalized)) {
|
|
idleMinutes = Math.max(normalized, 1);
|
|
}
|
|
} else if (mode === "idle") {
|
|
idleMinutes = DEFAULT_IDLE_MINUTES;
|
|
}
|
|
|
|
return { mode, atHour, idleMinutes };
|
|
}
|
|
|
|
export function resolveChannelResetConfig(params: {
|
|
sessionCfg?: SessionConfig;
|
|
channel?: string | null;
|
|
}): SessionResetConfig | undefined {
|
|
const resetByChannel = params.sessionCfg?.resetByChannel;
|
|
if (!resetByChannel) return undefined;
|
|
const normalized = normalizeMessageChannel(params.channel);
|
|
const fallback = params.channel?.trim().toLowerCase();
|
|
const key = normalized ?? fallback;
|
|
if (!key) return undefined;
|
|
return resetByChannel[key] ?? resetByChannel[key.toLowerCase()];
|
|
}
|
|
|
|
export function evaluateSessionFreshness(params: {
|
|
updatedAt: number;
|
|
now: number;
|
|
policy: SessionResetPolicy;
|
|
}): SessionFreshness {
|
|
const dailyResetAt =
|
|
params.policy.mode === "daily"
|
|
? resolveDailyResetAtMs(params.now, params.policy.atHour)
|
|
: undefined;
|
|
const idleExpiresAt =
|
|
params.policy.idleMinutes != null
|
|
? params.updatedAt + params.policy.idleMinutes * 60_000
|
|
: undefined;
|
|
const staleDaily = dailyResetAt != null && params.updatedAt < dailyResetAt;
|
|
const staleIdle = idleExpiresAt != null && params.now > idleExpiresAt;
|
|
return {
|
|
fresh: !(staleDaily || staleIdle),
|
|
dailyResetAt,
|
|
idleExpiresAt,
|
|
};
|
|
}
|
|
|
|
function normalizeResetAtHour(value: number | undefined): number {
|
|
if (typeof value !== "number" || !Number.isFinite(value)) return DEFAULT_RESET_AT_HOUR;
|
|
const normalized = Math.floor(value);
|
|
if (!Number.isFinite(normalized)) return DEFAULT_RESET_AT_HOUR;
|
|
if (normalized < 0) return 0;
|
|
if (normalized > 23) return 23;
|
|
return normalized;
|
|
}
|