@poolzin/pool-bot 2026.2.21 → 2026.2.22

package/dist/gateway/session-utils.js

@@ -3,15 +3,15 @@ import path from "node:path";
 import { resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../agents/agent-scope.js";
 import { lookupContextTokens } from "../agents/context.js";
 import { DEFAULT_CONTEXT_TOKENS, DEFAULT_MODEL, DEFAULT_PROVIDER } from "../agents/defaults.js";
-import { resolveConfiguredModelRef, resolveDefaultModelForAgent, } from "../agents/model-selection.js";
+import { parseModelRef, resolveConfiguredModelRef, resolveDefaultModelForAgent, } from "../agents/model-selection.js";
 import { loadConfig } from "../config/config.js";
 import { resolveStateDir } from "../config/paths.js";
-import { buildGroupDisplayName, canonicalizeMainSessionAlias, loadSessionStore, resolveMainSessionKey, resolveStorePath, } from "../config/sessions.js";
+import { buildGroupDisplayName, canonicalizeMainSessionAlias, loadSessionStore, resolveAgentMainSessionKey, resolveFreshSessionTotalTokens, resolveMainSessionKey, resolveStorePath, } from "../config/sessions.js";
 import { normalizeAgentId, normalizeMainKey, parseAgentSessionKey, } from "../routing/session-key.js";
 import { isCronRunSessionKey } from "../sessions/session-key-utils.js";
 import { normalizeSessionDeliveryFields } from "../utils/delivery-context.js";
-import { readFirstUserMessageFromTranscript, readLastMessagePreviewFromTranscript, } from "./session-utils.fs.js";
-export { archiveFileOnDisk, capArrayByJsonBytes, readFirstUserMessageFromTranscript, readLastMessagePreviewFromTranscript, readSessionPreviewItemsFromTranscript, readSessionMessages, resolveSessionTranscriptCandidates, } from "./session-utils.fs.js";
+import { readSessionTitleFieldsFromTranscript } from "./session-utils.fs.js";
+export { archiveFileOnDisk, archiveSessionTranscripts, capArrayByJsonBytes, readFirstUserMessageFromTranscript, readLastMessagePreviewFromTranscript, readSessionTitleFieldsFromTranscript, readSessionPreviewItemsFromTranscript, readSessionMessages, resolveSessionTranscriptCandidates, } from "./session-utils.fs.js";
 const DERIVED_TITLE_MAX_LEN = 60;
 const AVATAR_MAX_BYTES = 2 * 1024 * 1024;
 const AVATAR_DATA_RE = /^data:/i;
@@ -34,34 +34,43 @@ function resolveAvatarMime(filePath) {
     return AVATAR_MIME_BY_EXT[ext] ?? "application/octet-stream";
 }
 function isWorkspaceRelativePath(value) {
-    if (!value)
+    if (!value) {
         return false;
-    if (value.startsWith("~"))
+    }
+    if (value.startsWith("~")) {
         return false;
-    if (AVATAR_SCHEME_RE.test(value) && !WINDOWS_ABS_RE.test(value))
+    }
+    if (AVATAR_SCHEME_RE.test(value) && !WINDOWS_ABS_RE.test(value)) {
         return false;
+    }
     return true;
 }
 function resolveIdentityAvatarUrl(cfg, agentId, avatar) {
-    if (!avatar)
+    if (!avatar) {
         return undefined;
+    }
     const trimmed = avatar.trim();
-    if (!trimmed)
+    if (!trimmed) {
         return undefined;
-    if (AVATAR_DATA_RE.test(trimmed) || AVATAR_HTTP_RE.test(trimmed))
+    }
+    if (AVATAR_DATA_RE.test(trimmed) || AVATAR_HTTP_RE.test(trimmed)) {
         return trimmed;
-    if (!isWorkspaceRelativePath(trimmed))
+    }
+    if (!isWorkspaceRelativePath(trimmed)) {
         return undefined;
+    }
     const workspaceDir = resolveAgentWorkspaceDir(cfg, agentId);
     const workspaceRoot = path.resolve(workspaceDir);
     const resolved = path.resolve(workspaceRoot, trimmed);
     const relative = path.relative(workspaceRoot, resolved);
-    if (relative.startsWith("..") || path.isAbsolute(relative))
+    if (relative.startsWith("..") || path.isAbsolute(relative)) {
         return undefined;
+    }
     try {
         const stat = fs.statSync(resolved);
-        if (!stat.isFile() || stat.size > AVATAR_MAX_BYTES)
+        if (!stat.isFile() || stat.size > AVATAR_MAX_BYTES) {
             return undefined;
+        }
         const buffer = fs.readFileSync(resolved);
         const mime = resolveAvatarMime(resolved);
         return `data:${mime};base64,${buffer.toString("base64")}`;
@@ -80,17 +89,20 @@ function formatSessionIdPrefix(sessionId, updatedAt) {
     return prefix;
 }
 function truncateTitle(text, maxLen) {
-    if (text.length <= maxLen)
+    if (text.length <= maxLen) {
         return text;
+    }
     const cut = text.slice(0, maxLen - 1);
     const lastSpace = cut.lastIndexOf(" ");
-    if (lastSpace > maxLen * 0.6)
+    if (lastSpace > maxLen * 0.6) {
         return cut.slice(0, lastSpace) + "…";
+    }
     return cut + "…";
 }
 export function deriveSessionTitle(entry, firstUserMessage) {
-    if (!entry)
+    if (!entry) {
         return undefined;
+    }
     if (entry.displayName?.trim()) {
         return entry.displayName.trim();
     }
@@ -113,14 +125,76 @@ export function loadSessionEntry(sessionKey) {
     const agentId = resolveSessionStoreAgentId(cfg, canonicalKey);
     const storePath = resolveStorePath(sessionCfg?.store, { agentId });
     const store = loadSessionStore(storePath);
-    const entry = store[canonicalKey];
-    return { cfg, storePath, store, entry, canonicalKey };
+    const match = findStoreMatch(store, canonicalKey, sessionKey.trim());
+    const legacyKey = match?.key !== canonicalKey ? match?.key : undefined;
+    return { cfg, storePath, store, entry: match?.entry, canonicalKey, legacyKey };
+}
+/**
+ * Find a session entry by exact or case-insensitive key match.
+ * Returns both the entry and the actual store key it was found under,
+ * so callers can clean up legacy mixed-case keys when they differ from canonicalKey.
+ */
+function findStoreMatch(store, ...candidates) {
+    // Exact match first.
+    for (const candidate of candidates) {
+        if (candidate && store[candidate]) {
+            return { entry: store[candidate], key: candidate };
+        }
+    }
+    // Case-insensitive scan for ALL candidates.
+    const loweredSet = new Set(candidates.filter(Boolean).map((c) => c.toLowerCase()));
+    for (const key of Object.keys(store)) {
+        if (loweredSet.has(key.toLowerCase())) {
+            return { entry: store[key], key };
+        }
+    }
+    return undefined;
+}
+/**
+ * Find all on-disk store keys that match the given key case-insensitively.
+ * Returns every key from the store whose lowercased form equals the target's lowercased form.
+ */
+export function findStoreKeysIgnoreCase(store, targetKey) {
+    const lowered = targetKey.toLowerCase();
+    const matches = [];
+    for (const key of Object.keys(store)) {
+        if (key.toLowerCase() === lowered) {
+            matches.push(key);
+        }
+    }
+    return matches;
+}
+/**
+ * Remove legacy key variants for one canonical session key.
+ * Candidates can include aliases (for example, "agent:ops:main" when canonical is "agent:ops:work").
+ */
+export function pruneLegacyStoreKeys(params) {
+    const keysToDelete = new Set();
+    for (const candidate of params.candidates) {
+        const trimmed = String(candidate ?? "").trim();
+        if (!trimmed) {
+            continue;
+        }
+        if (trimmed !== params.canonicalKey) {
+            keysToDelete.add(trimmed);
+        }
+        for (const match of findStoreKeysIgnoreCase(params.store, trimmed)) {
+            if (match !== params.canonicalKey) {
+                keysToDelete.add(match);
+            }
+        }
+    }
+    for (const key of keysToDelete) {
+        delete params.store[key];
+    }
 }
 export function classifySessionKey(key, entry) {
-    if (key === "global")
+    if (key === "global") {
         return "global";
-    if (key === "unknown")
+    }
+    if (key === "unknown") {
         return "unknown";
+    }
     if (entry?.chatType === "group" || entry?.chatType === "channel") {
         return "group";
     }
@@ -164,8 +238,9 @@ function listConfiguredAgentIds(cfg) {
     if (agents.length > 0) {
         const ids = new Set();
         for (const entry of agents) {
-            if (entry?.id)
+            if (entry?.id) {
                 ids.add(normalizeAgentId(entry.id));
+            }
         }
         const defaultId = normalizeAgentId(resolveDefaultAgentId(cfg));
         ids.add(defaultId);
@@ -178,8 +253,9 @@ function listConfiguredAgentIds(cfg) {
     const ids = new Set();
     const defaultId = normalizeAgentId(resolveDefaultAgentId(cfg));
     ids.add(defaultId);
-    for (const id of listExistingAgentIdsFromDisk())
+    for (const id of listExistingAgentIdsFromDisk()) {
         ids.add(id);
+    }
     const sorted = Array.from(ids).filter(Boolean);
     sorted.sort((a, b) => a.localeCompare(b));
     if (sorted.includes(defaultId)) {
@@ -193,8 +269,9 @@ export function listAgentsForGateway(cfg) {
     const scope = cfg.session?.scope ?? "per-sender";
     const configuredById = new Map();
     for (const entry of cfg.agents?.list ?? []) {
-        if (!entry?.id)
+        if (!entry?.id) {
             continue;
+        }
         const identity = entry.identity
             ? {
                 name: entry.identity.name?.trim() || undefined,
@@ -214,7 +291,7 @@ export function listAgentsForGateway(cfg) {
         .filter(Boolean));
     const allowedIds = explicitIds.size > 0 ? new Set([...explicitIds, defaultId]) : null;
     let agentIds = listConfiguredAgentIds(cfg).filter((id) => allowedIds ? allowedIds.has(id) : true);
-    if (mainKey && !agentIds.includes(mainKey)) {
+    if (mainKey && !agentIds.includes(mainKey) && (!allowedIds || allowedIds.has(mainKey))) {
         agentIds = [...agentIds, mainKey];
     }
     const agents = agentIds.map((id) => {
@@ -228,58 +305,79 @@ export function listAgentsForGateway(cfg) {
     return { defaultId, mainKey, scope, agents };
 }
 function canonicalizeSessionKeyForAgent(agentId, key) {
-    if (key === "global" || key === "unknown")
-        return key;
-    if (key.startsWith("agent:"))
-        return key;
-    return `agent:${normalizeAgentId(agentId)}:${key}`;
+    const lowered = key.toLowerCase();
+    if (lowered === "global" || lowered === "unknown") {
+        return lowered;
+    }
+    if (lowered.startsWith("agent:")) {
+        return lowered;
+    }
+    return `agent:${normalizeAgentId(agentId)}:${lowered}`;
 }
 function resolveDefaultStoreAgentId(cfg) {
     return normalizeAgentId(resolveDefaultAgentId(cfg));
 }
 export function resolveSessionStoreKey(params) {
     const raw = params.sessionKey.trim();
-    if (!raw)
-        return raw;
-    if (raw === "global" || raw === "unknown")
+    if (!raw) {
         return raw;
+    }
+    const rawLower = raw.toLowerCase();
+    if (rawLower === "global" || rawLower === "unknown") {
+        return rawLower;
+    }
     const parsed = parseAgentSessionKey(raw);
     if (parsed) {
         const agentId = normalizeAgentId(parsed.agentId);
+        const lowered = raw.toLowerCase();
         const canonical = canonicalizeMainSessionAlias({
             cfg: params.cfg,
             agentId,
-            sessionKey: raw,
+            sessionKey: lowered,
         });
-        if (canonical !== raw)
+        if (canonical !== lowered) {
             return canonical;
-        return raw;
+        }
+        return lowered;
     }
+    const lowered = raw.toLowerCase();
     const rawMainKey = normalizeMainKey(params.cfg.session?.mainKey);
-    if (raw === "main" || raw === rawMainKey) {
+    if (lowered === "main" || lowered === rawMainKey) {
         return resolveMainSessionKey(params.cfg);
     }
     const agentId = resolveDefaultStoreAgentId(params.cfg);
-    return canonicalizeSessionKeyForAgent(agentId, raw);
+    return canonicalizeSessionKeyForAgent(agentId, lowered);
 }
 function resolveSessionStoreAgentId(cfg, canonicalKey) {
     if (canonicalKey === "global" || canonicalKey === "unknown") {
         return resolveDefaultStoreAgentId(cfg);
     }
     const parsed = parseAgentSessionKey(canonicalKey);
-    if (parsed?.agentId)
+    if (parsed?.agentId) {
         return normalizeAgentId(parsed.agentId);
+    }
     return resolveDefaultStoreAgentId(cfg);
 }
-function canonicalizeSpawnedByForAgent(agentId, spawnedBy) {
+export function canonicalizeSpawnedByForAgent(cfg, agentId, spawnedBy) {
     const raw = spawnedBy?.trim();
-    if (!raw)
+    if (!raw) {
         return undefined;
-    if (raw === "global" || raw === "unknown")
-        return raw;
-    if (raw.startsWith("agent:"))
-        return raw;
-    return `agent:${normalizeAgentId(agentId)}:${raw}`;
+    }
+    const lower = raw.toLowerCase();
+    if (lower === "global" || lower === "unknown") {
+        return lower;
+    }
+    let result;
+    if (raw.toLowerCase().startsWith("agent:")) {
+        result = raw.toLowerCase();
+    }
+    else {
+        result = `agent:${normalizeAgentId(agentId)}:${lower}`;
+    }
+    // Resolve main-alias references (e.g. agent:ops:main → configured main key).
+    const parsed = parseAgentSessionKey(result);
+    const resolvedAgent = parsed?.agentId ? normalizeAgentId(parsed.agentId) : agentId;
+    return canonicalizeMainSessionAlias({ cfg, agentId: resolvedAgent, sessionKey: result });
 }
 export function resolveGatewaySessionStoreTarget(params) {
     const key = params.key.trim();
@@ -296,8 +394,26 @@ export function resolveGatewaySessionStoreTarget(params) {
     }
     const storeKeys = new Set();
     storeKeys.add(canonicalKey);
-    if (key && key !== canonicalKey)
+    if (key && key !== canonicalKey) {
         storeKeys.add(key);
+    }
+    if (params.scanLegacyKeys !== false) {
+        // Build a set of scan targets: all known keys plus the main alias key so we
+        // catch legacy entries stored under "agent:{id}:MAIN" when mainKey != "main".
+        const scanTargets = new Set(storeKeys);
+        const agentMainKey = resolveAgentMainSessionKey({ cfg: params.cfg, agentId });
+        if (canonicalKey === agentMainKey) {
+            scanTargets.add(`agent:${agentId}:main`);
+        }
+        // Scan the on-disk store for case variants of every target to find
+        // legacy mixed-case entries (e.g. "agent:ops:MAIN" when canonical is "agent:ops:work").
+        const store = params.store ?? loadSessionStore(storePath);
+        for (const seed of scanTargets) {
+            for (const legacyKey of findStoreKeysIgnoreCase(store, seed)) {
+                storeKeys.add(legacyKey);
+            }
+        }
+    }
     return {
         agentId,
         storePath,
@@ -307,20 +423,20 @@ export function resolveGatewaySessionStoreTarget(params) {
 }
 // Merge with existing entry based on latest timestamp to ensure data consistency and avoid overwriting with less complete data.
 function mergeSessionEntryIntoCombined(params) {
-    const { combined, entry, agentId, canonicalKey } = params;
+    const { cfg, combined, entry, agentId, canonicalKey } = params;
     const existing = combined[canonicalKey];
     if (existing && (existing.updatedAt ?? 0) > (entry.updatedAt ?? 0)) {
         combined[canonicalKey] = {
             ...entry,
             ...existing,
-            spawnedBy: canonicalizeSpawnedByForAgent(agentId, existing.spawnedBy ?? entry.spawnedBy),
+            spawnedBy: canonicalizeSpawnedByForAgent(cfg, agentId, existing.spawnedBy ?? entry.spawnedBy),
         };
     }
     else {
         combined[canonicalKey] = {
             ...existing,
             ...entry,
-            spawnedBy: canonicalizeSpawnedByForAgent(agentId, entry.spawnedBy ?? existing?.spawnedBy),
+            spawnedBy: canonicalizeSpawnedByForAgent(cfg, agentId, entry.spawnedBy ?? existing?.spawnedBy),
         };
     }
 }
@@ -334,6 +450,7 @@ export function loadCombinedSessionStoreForGateway(cfg) {
         for (const [key, entry] of Object.entries(store)) {
             const canonicalKey = canonicalizeSessionKeyForAgent(defaultAgentId, key);
             mergeSessionEntryIntoCombined({
+                cfg,
                 combined,
                 entry,
                 agentId: defaultAgentId,
@@ -350,6 +467,7 @@ export function loadCombinedSessionStoreForGateway(cfg) {
         for (const [key, entry] of Object.entries(store)) {
             const canonicalKey = canonicalizeSessionKeyForAgent(agentId, key);
             mergeSessionEntryIntoCombined({
+                cfg,
                 combined,
                 entry,
                 agentId,
@@ -383,12 +501,38 @@ export function resolveSessionModelRef(cfg, entry, agentId) {
             defaultProvider: DEFAULT_PROVIDER,
             defaultModel: DEFAULT_MODEL,
         });
+    // Prefer the last runtime model recorded on the session entry.
+    // This is the actual model used by the latest run and must win over defaults.
     let provider = resolved.provider;
     let model = resolved.model;
+    const runtimeModel = entry?.model?.trim();
+    const runtimeProvider = entry?.modelProvider?.trim();
+    if (runtimeModel) {
+        const parsedRuntime = parseModelRef(runtimeModel, runtimeProvider || provider || DEFAULT_PROVIDER);
+        if (parsedRuntime) {
+            provider = parsedRuntime.provider;
+            model = parsedRuntime.model;
+        }
+        else {
+            provider = runtimeProvider || provider;
+            model = runtimeModel;
+        }
+        return { provider, model };
+    }
+    // Fall back to explicit per-session override (set at spawn/model-patch time),
+    // then finally to configured defaults.
     const storedModelOverride = entry?.modelOverride?.trim();
     if (storedModelOverride) {
-        provider = entry?.providerOverride?.trim() || provider;
-        model = storedModelOverride;
+        const overrideProvider = entry?.providerOverride?.trim() || provider || DEFAULT_PROVIDER;
+        const parsedOverride = parseModelRef(storedModelOverride, overrideProvider);
+        if (parsedOverride) {
+            provider = parsedOverride.provider;
+            model = parsedOverride.model;
+        }
+        else {
+            provider = overrideProvider;
+            model = storedModelOverride;
+        }
     }
     return { provider, model };
 }
@@ -408,39 +552,46 @@ export function listSessionsFromStore(params) {
         : undefined;
     let sessions = Object.entries(store)
         .filter(([key]) => {
-        if (isCronRunSessionKey(key))
+        if (isCronRunSessionKey(key)) {
             return false;
-        if (!includeGlobal && key === "global")
+        }
+        if (!includeGlobal && key === "global") {
             return false;
-        if (!includeUnknown && key === "unknown")
+        }
+        if (!includeUnknown && key === "unknown") {
             return false;
+        }
         if (agentId) {
-            if (key === "global" || key === "unknown")
+            if (key === "global" || key === "unknown") {
                 return false;
+            }
             const parsed = parseAgentSessionKey(key);
-            if (!parsed)
+            if (!parsed) {
                 return false;
+            }
             return normalizeAgentId(parsed.agentId) === agentId;
         }
         return true;
     })
         .filter(([key, entry]) => {
-        if (!spawnedBy)
+        if (!spawnedBy) {
             return true;
-        if (key === "unknown" || key === "global")
+        }
+        if (key === "unknown" || key === "global") {
             return false;
+        }
         return entry?.spawnedBy === spawnedBy;
     })
         .filter(([, entry]) => {
-        if (!label)
+        if (!label) {
             return true;
+        }
         return entry?.label === label;
     })
         .map(([key, entry]) => {
         const updatedAt = entry?.updatedAt ?? null;
-        const input = entry?.inputTokens ?? 0;
-        const output = entry?.outputTokens ?? 0;
-        const total = entry?.totalTokens ?? input + output;
+        const total = resolveFreshSessionTotalTokens(entry);
+        const totalTokensFresh = typeof entry?.totalTokens === "number" ? entry?.totalTokensFresh !== false : false;
         const parsed = parseGroupKey(key);
         const channel = entry?.channel ?? parsed?.channel;
         const subject = entry?.subject;
@@ -492,6 +643,7 @@ export function listSessionsFromStore(params) {
             inputTokens: entry?.inputTokens,
             outputTokens: entry?.outputTokens,
             totalTokens: total,
+            totalTokensFresh,
             responseUsage: entry?.responseUsage,
             modelProvider,
             model,
@@ -522,14 +674,16 @@ export function listSessionsFromStore(params) {
         let derivedTitle;
         let lastMessagePreview;
         if (entry?.sessionId) {
-            if (includeDerivedTitles) {
-                const firstUserMsg = readFirstUserMessageFromTranscript(entry.sessionId, storePath, entry.sessionFile);
-                derivedTitle = deriveSessionTitle(entry, firstUserMsg);
-            }
-            if (includeLastMessage) {
-                const lastMsg = readLastMessagePreviewFromTranscript(entry.sessionId, storePath, entry.sessionFile);
-                if (lastMsg)
-                    lastMessagePreview = lastMsg;
+            if (includeDerivedTitles || includeLastMessage) {
+                const parsed = parseAgentSessionKey(s.key);
+                const agentId = parsed && parsed.agentId ? normalizeAgentId(parsed.agentId) : resolveDefaultAgentId(cfg);
+                const fields = readSessionTitleFieldsFromTranscript(entry.sessionId, storePath, entry.sessionFile, agentId);
+                if (includeDerivedTitles) {
+                    derivedTitle = deriveSessionTitle(entry, fields.firstUserMessage);
+                }
+                if (includeLastMessage && fields.lastMessagePreview) {
+                    lastMessagePreview = fields.lastMessagePreview;
+                }
             }
         }
         return { ...rest, derivedTitle, lastMessagePreview };