devchain-cli 0.14.0 → 0.15.0

package/dist/server/modules/session-reader/readers/opencode-sqlite.reader.js

@@ -0,0 +1,378 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OpencodeSqliteReader = void 0;
+exports.normalizeOpencodeSession = normalizeOpencodeSession;
+const better_sqlite3_1 = __importDefault(require("better-sqlite3"));
+const logger_1 = require("../../../common/logging/logger");
+const error_types_1 = require("../../../common/errors/error-types");
+const estimate_content_tokens_1 = require("../adapters/utils/estimate-content-tokens");
+const logger = (0, logger_1.createLogger)('OpencodeSqliteReader');
+const PROVIDER_NAME = 'opencode';
+const DEFAULT_MAX_TOOL_OUTPUT_CHARS = 100_000;
+const DEFAULT_BUSY_TIMEOUT_MS = 5_000;
+const DEFAULT_OPEN_RETRIES = 3;
+const OPEN_RETRY_DELAY_MS = 50;
+const DEFAULT_CONTEXT_WINDOW_TOKENS = 200_000;
+class OpencodeSqliteReader {
+    constructor(pricing, options) {
+        this.pricing = pricing;
+        this.maxToolOutputChars = options?.maxToolOutputChars ?? DEFAULT_MAX_TOOL_OUTPUT_CHARS;
+        this.busyTimeoutMs = options?.busyTimeoutMs ?? DEFAULT_BUSY_TIMEOUT_MS;
+        this.openRetries = options?.openRetries ?? DEFAULT_OPEN_RETRIES;
+    }
+    readSession(dbPath, providerSessionId) {
+        return this.withDb(dbPath, (db) => {
+            this.assertSchema(db);
+            const sessionRow = db
+                .prepare(`SELECT id, title, model, agent, parent_id, time_created, time_updated
+           FROM session WHERE id = ?`)
+                .get(providerSessionId);
+            if (!sessionRow) {
+                throw new error_types_1.NotFoundError('OpenCode session', providerSessionId);
+            }
+            const messageRows = db
+                .prepare(`SELECT id, time_created, time_updated, data
+           FROM message WHERE session_id = ? ORDER BY time_created, id`)
+                .all(providerSessionId);
+            const partRows = db
+                .prepare(`SELECT id, message_id, time_updated, data
+           FROM part WHERE session_id = ? ORDER BY id`)
+                .all(providerSessionId);
+            return normalizeOpencodeSession(dbPath, sessionRow, messageRows, partRows, {
+                pricing: this.pricing,
+                maxToolOutputChars: this.maxToolOutputChars,
+            });
+        });
+    }
+    getFreshness(dbPath, providerSessionId) {
+        return this.withDb(dbPath, (db) => {
+            this.assertSchema(db);
+            const row = db
+                .prepare(`SELECT
+             (SELECT count(*) FROM part WHERE session_id = @sid) AS count,
+             max(
+               COALESCE((SELECT max(time_updated) FROM part WHERE session_id = @sid), 0),
+               COALESCE((SELECT max(time_updated) FROM message WHERE session_id = @sid), 0),
+               COALESCE((SELECT time_updated FROM session WHERE id = @sid), 0)
+             ) AS maxUpdated`)
+                .get({ sid: providerSessionId });
+            return { count: row?.count ?? 0, maxUpdated: row?.maxUpdated ?? 0 };
+        });
+    }
+    findSessionCandidates(dbPath, params) {
+        return this.withDb(dbPath, (db) => {
+            this.assertSchema(db);
+            const rows = db
+                .prepare(`SELECT s.id AS providerSessionId, s.directory AS directory,
+                  s.time_created AS timeCreated, s.time_updated AS timeUpdated
+           FROM session s
+           LEFT JOIN project p ON p.id = s.project_id
+           WHERE (s.directory = @dir OR p.worktree = @dir)
+             AND abs(s.time_created - @startedAt) <= @window
+           ORDER BY abs(s.time_created - @startedAt) ASC`)
+                .all({
+                dir: params.directory,
+                startedAt: params.startedAtMs,
+                window: params.windowMs,
+            });
+            return rows;
+        });
+    }
+    withDb(dbPath, fn) {
+        let lastError;
+        for (let attempt = 0; attempt <= this.openRetries; attempt++) {
+            let db;
+            try {
+                db = new better_sqlite3_1.default(dbPath, { readonly: true, fileMustExist: true });
+                db.pragma(`busy_timeout = ${this.busyTimeoutMs}`);
+                return fn(db);
+            }
+            catch (error) {
+                lastError = error;
+                if (!this.isTransientLock(error) || attempt === this.openRetries) {
+                    throw this.wrapOpenError(error, dbPath);
+                }
+                this.sleep(OPEN_RETRY_DELAY_MS * (attempt + 1));
+            }
+            finally {
+                db?.close();
+            }
+        }
+        throw this.wrapOpenError(lastError, dbPath);
+    }
+    isTransientLock(error) {
+        const code = error?.code;
+        return code === 'SQLITE_BUSY' || code === 'SQLITE_LOCKED';
+    }
+    wrapOpenError(error, dbPath) {
+        if (error instanceof error_types_1.NotFoundError || error instanceof error_types_1.ValidationError) {
+            return error;
+        }
+        return new error_types_1.ValidationError('Failed to open OpenCode SQLite container', {
+            category: 'opencode-db',
+            dbPath,
+            error: String(error?.message ?? error),
+        });
+    }
+    sleep(ms) {
+        const end = Date.now() + ms;
+        while (Date.now() < end) {
+        }
+    }
+    assertSchema(db) {
+        const tables = new Set(db
+            .prepare(`SELECT name FROM sqlite_master
+             WHERE type = 'table' AND name IN ('session', 'message', 'part')`)
+            .all().map((r) => r.name));
+        for (const required of ['session', 'message', 'part']) {
+            if (!tables.has(required)) {
+                throw new error_types_1.ValidationError('OpenCode DB schema drift: missing table', {
+                    category: 'opencode-schema',
+                    missingTable: required,
+                });
+            }
+        }
+        this.assertColumns(db, 'session', ['id', 'time_updated']);
+        this.assertColumns(db, 'message', ['id', 'session_id', 'data']);
+        this.assertColumns(db, 'part', ['id', 'message_id', 'session_id', 'data']);
+    }
+    assertColumns(db, table, required) {
+        const cols = new Set(db.prepare(`PRAGMA table_info(${table})`).all().map((c) => c.name));
+        for (const col of required) {
+            if (!cols.has(col)) {
+                throw new error_types_1.ValidationError('OpenCode DB schema drift: missing column', {
+                    category: 'opencode-schema',
+                    table,
+                    missingColumn: col,
+                });
+            }
+        }
+    }
+}
+exports.OpencodeSqliteReader = OpencodeSqliteReader;
+function normalizeOpencodeSession(dbPath, sessionRow, messageRows, partRows, options) {
+    const maxToolOutputChars = options?.maxToolOutputChars ?? DEFAULT_MAX_TOOL_OUTPUT_CHARS;
+    const pricing = options?.pricing;
+    const partsByMessage = new Map();
+    let sizeBytes = 0;
+    let maxUpdated = sessionRow.time_updated ?? 0;
+    for (const part of partRows) {
+        sizeBytes += Buffer.byteLength(part.data, 'utf8');
+        if (part.time_updated > maxUpdated)
+            maxUpdated = part.time_updated;
+        const bucket = partsByMessage.get(part.message_id);
+        if (bucket)
+            bucket.push(part);
+        else
+            partsByMessage.set(part.message_id, [part]);
+    }
+    const messages = [];
+    const modelsSet = new Set();
+    let primaryModel = '';
+    let totalInput = 0;
+    let totalOutput = 0;
+    let totalCacheRead = 0;
+    let totalCacheCreation = 0;
+    let compactionCount = 0;
+    let lastAssistantContextTokens = 0;
+    for (const messageRow of messageRows) {
+        if (messageRow.time_updated > maxUpdated)
+            maxUpdated = messageRow.time_updated;
+        const data = safeParse(messageRow.data) ?? {};
+        const role = data.role === 'assistant' ? 'assistant' : 'user';
+        if (data.modelID) {
+            modelsSet.add(data.modelID);
+            if (!primaryModel)
+                primaryModel = data.modelID;
+        }
+        const content = [];
+        const toolCalls = [];
+        const toolResults = [];
+        let isCompactSummary = false;
+        for (const part of partsByMessage.get(messageRow.id) ?? []) {
+            const p = safeParse(part.data);
+            if (!p?.type)
+                continue;
+            switch (p.type) {
+                case 'text': {
+                    const text = (p.text ?? '').trim();
+                    if (text)
+                        content.push({ type: 'text', text });
+                    break;
+                }
+                case 'reasoning': {
+                    const thinking = (p.text ?? '').trim();
+                    if (thinking)
+                        content.push({ type: 'thinking', thinking });
+                    break;
+                }
+                case 'tool': {
+                    mapToolPart(p, content, toolCalls, toolResults, maxToolOutputChars);
+                    break;
+                }
+                case 'step-finish': {
+                    if (p.tokens) {
+                        totalInput += p.tokens.input ?? 0;
+                        totalOutput += (p.tokens.output ?? 0) + (p.tokens.reasoning ?? 0);
+                        totalCacheRead += p.tokens.cache?.read ?? 0;
+                        totalCacheCreation += p.tokens.cache?.write ?? 0;
+                    }
+                    break;
+                }
+                case 'compaction': {
+                    isCompactSummary = true;
+                    compactionCount++;
+                    content.push({ type: 'text', text: '[Conversation compacted]' });
+                    break;
+                }
+                case 'patch': {
+                    const files = Array.isArray(p.files) ? p.files : [];
+                    if (files.length > 0) {
+                        content.push({
+                            type: 'text',
+                            text: `📝 Updated ${files.length} file(s):\n${files.map((f) => `- ${f}`).join('\n')}`,
+                        });
+                    }
+                    break;
+                }
+                default:
+                    break;
+            }
+        }
+        let usage;
+        if (role === 'assistant' && data.tokens) {
+            usage = {
+                input: data.tokens.input ?? 0,
+                output: (data.tokens.output ?? 0) + (data.tokens.reasoning ?? 0),
+                cacheRead: data.tokens.cache?.read ?? 0,
+                cacheCreation: data.tokens.cache?.write ?? 0,
+            };
+            lastAssistantContextTokens =
+                usage.input + usage.output + usage.cacheRead + usage.cacheCreation;
+        }
+        if (content.length === 0)
+            continue;
+        messages.push({
+            id: messageRow.id,
+            parentId: data.parentID ?? null,
+            role,
+            timestamp: new Date(messageRow.time_created),
+            content,
+            usage,
+            model: data.modelID,
+            toolCalls,
+            toolResults,
+            isMeta: false,
+            isSidechain: false,
+            isCompactSummary: isCompactSummary || undefined,
+            stopReason: role === 'assistant' ? (data.finish === 'tool-calls' ? 'tool_use' : 'end_turn') : undefined,
+        });
+    }
+    if (!primaryModel)
+        primaryModel = parseSessionModelId(sessionRow.model);
+    const totalTokens = totalInput + totalOutput + totalCacheRead + totalCacheCreation;
+    const costUsd = pricing && primaryModel
+        ? pricing.calculateMessageCost(primaryModel, totalInput, totalOutput, totalCacheRead, totalCacheCreation)
+        : 0;
+    const visibleContextTokens = (0, estimate_content_tokens_1.estimateVisibleFromMessages)(messages);
+    const contextWindowTokens = (primaryModel && pricing?.getContextWindowSize(primaryModel)) || DEFAULT_CONTEXT_WINDOW_TOKENS;
+    const durationMs = messages.length >= 2
+        ? messages[messages.length - 1].timestamp.getTime() - messages[0].timestamp.getTime()
+        : Math.max(0, (sessionRow.time_updated ?? 0) - (sessionRow.time_created ?? 0));
+    const phaseBreakdowns = [
+        { phaseNumber: 1, contribution: visibleContextTokens, peakTokens: visibleContextTokens },
+    ];
+    const metrics = {
+        inputTokens: totalInput,
+        outputTokens: totalOutput,
+        cacheReadTokens: totalCacheRead,
+        cacheCreationTokens: totalCacheCreation,
+        totalTokens,
+        totalContextConsumption: visibleContextTokens,
+        compactionCount,
+        phaseBreakdowns,
+        visibleContextTokens,
+        totalContextTokens: lastAssistantContextTokens,
+        contextWindowTokens,
+        costUsd,
+        primaryModel,
+        modelsUsed: modelsSet.size > 1 ? Array.from(modelsSet) : undefined,
+        durationMs,
+        messageCount: messages.length,
+        isOngoing: false,
+    };
+    const session = {
+        id: sessionRow.id,
+        providerName: PROVIDER_NAME,
+        filePath: dbPath,
+        messages,
+        metrics,
+        isOngoing: false,
+    };
+    return { session, sizeBytes, freshness: { count: partRows.length, maxUpdated } };
+}
+function mapToolPart(p, content, toolCalls, toolResults, maxToolOutputChars) {
+    const toolCallId = p.callID ?? '';
+    const toolName = p.tool ?? 'unknown';
+    const input = (p.state?.input ?? {});
+    const isError = p.state?.status === 'error';
+    content.push({ type: 'tool_call', toolCallId, toolName, input });
+    toolCalls.push({ id: toolCallId, name: toolName, input, isTask: false });
+    const rawOutput = isError ? (p.state?.error ?? '') : p.state?.output;
+    const { content: outContent, isTruncated, fullLength, } = capToolOutput(rawOutput, maxToolOutputChars);
+    content.push({
+        type: 'tool_result',
+        toolCallId,
+        content: outContent,
+        isError,
+        ...(isTruncated ? { isTruncated, fullLength } : {}),
+    });
+    toolResults.push({
+        toolCallId,
+        content: outContent,
+        isError,
+        ...(isTruncated ? { isTruncated, fullLength } : {}),
+    });
+}
+function capToolOutput(rawOutput, maxChars) {
+    let text;
+    if (typeof rawOutput === 'string') {
+        text = rawOutput;
+    }
+    else if (rawOutput == null) {
+        text = '';
+    }
+    else {
+        try {
+            text = JSON.stringify(rawOutput);
+        }
+        catch {
+            text = String(rawOutput);
+        }
+    }
+    if (text.length > maxChars) {
+        return { content: text.slice(0, maxChars), isTruncated: true, fullLength: text.length };
+    }
+    return { content: text, isTruncated: false };
+}
+function parseSessionModelId(raw) {
+    if (!raw)
+        return '';
+    const parsed = safeParse(raw);
+    if (parsed && typeof parsed.id === 'string')
+        return parsed.id;
+    return raw;
+}
+function safeParse(json) {
+    try {
+        return JSON.parse(json);
+    }
+    catch {
+        logger.debug('Failed to parse OpenCode JSON blob — skipping');
+        return null;
+    }
+}
+//# sourceMappingURL=opencode-sqlite.reader.js.map

package/dist/server/modules/session-reader/readers/opencode-sqlite.reader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"opencode-sqlite.reader.js","sourceRoot":"","sources":["../../../../src/modules/session-reader/readers/opencode-sqlite.reader.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/session-reader/services/session-cache.service.d.ts

@@ -1,12 +1,15 @@
 import { OnModuleDestroy } from '@nestjs/common';
-import type { SessionReaderAdapter } from '../adapters/session-reader-adapter.interface';
+import type { SessionReaderAdapter, SessionSourceRef } from '../adapters/session-reader-adapter.interface';
 import type { UnifiedSession } from '../dtos/unified-session.types';
 export interface SessionCacheEntry {
     session: UnifiedSession;
     lastOffset: number;
     lastSize: number;
     lastMtime: number;
+    sourceVersion: number;
+    freshnessToken: unknown;
     cachedAt: number;
+    boundaryFold: boolean;
 }
 export interface GetOrParseResult {
     session: UnifiedSession;
@@ -14,20 +17,26 @@ export interface GetOrParseResult {
     lastOffset: number;
     lastSize: number;
     lastMtime: number;
+    sourceVersion: number;
+    boundaryFold: boolean;
 }
 export declare class SessionCacheService implements OnModuleDestroy {
     private readonly logger;
     private readonly cache;
     onModuleDestroy(): void;
-    getOrParse(sessionId: string, filePath: string, adapter: SessionReaderAdapter): Promise<UnifiedSession>;
-    getOrParseWithMeta(sessionId: string, filePath: string, adapter: SessionReaderAdapter): Promise<GetOrParseResult>;
+    getOrParse(sessionId: string, source: string | SessionSourceRef, adapter: SessionReaderAdapter): Promise<UnifiedSession>;
+    getOrParseWithMeta(sessionId: string, source: string | SessionSourceRef, adapter: SessionReaderAdapter): Promise<GetOrParseResult>;
     getEntry(sessionId: string): SessionCacheEntry | undefined;
     invalidate(sessionId: string): void;
     clear(): void;
     get size(): number;
     private touchLru;
     private evictIfNeeded;
+    private foldLeadingContinuationIntoCachedTail;
     private mergeMetrics;
     private mergeWarnings;
     private statFile;
+    private toSourceRef;
+    private computeFreshness;
+    private dbSourceVersion;
 }

package/dist/server/modules/session-reader/services/session-cache.service.js

@@ -44,6 +44,8 @@ exports.SessionCacheService = void 0;
 const common_1 = require("@nestjs/common");
 const fs = __importStar(require("node:fs/promises"));
 const estimate_content_tokens_1 = require("../adapters/utils/estimate-content-tokens");
+const tool_result_fold_1 = require("../adapters/utils/tool-result-fold");
+const coalesce_turns_1 = require("../adapters/utils/coalesce-turns");
 const CACHE_TTL_MS = 10 * 60 * 1_000;
 const CACHE_MAX_ENTRIES = 20;
 let SessionCacheService = SessionCacheService_1 = class SessionCacheService {
@@ -54,26 +56,28 @@ let SessionCacheService = SessionCacheService_1 = class SessionCacheService {
     onModuleDestroy() {
         this.cache.clear();
     }
-    async getOrParse(sessionId, filePath, adapter) {
+    async getOrParse(sessionId, source, adapter) {
         const now = Date.now();
-        const fileStat = await this.statFile(filePath);
+        const ref = this.toSourceRef(source, adapter);
+        const threadRef = typeof source !== 'string' ? ref : undefined;
+        const freshness = await this.computeFreshness(ref, adapter);
         const cached = this.cache.get(sessionId);
         if (cached &&
             now - cached.cachedAt < CACHE_TTL_MS &&
-            fileStat.size === cached.lastSize &&
-            fileStat.mtimeMs === cached.lastMtime) {
+            JSON.stringify(cached.freshnessToken) === JSON.stringify(freshness.token)) {
             this.logger.debug({ sessionId }, 'Session cache hit');
             this.touchLru(sessionId, cached);
             return cached.session;
         }
         let session;
         let lastOffset;
-        if (cached && fileStat.size > cached.lastSize) {
-            this.logger.debug({ sessionId, lastOffset: cached.lastOffset, currentSize: fileStat.size }, 'Incremental parse (file grew)');
-            const result = await adapter.parseIncremental(filePath, {
-                byteOffset: cached.lastOffset,
-                includeToolCalls: true,
-            });
+        let boundaryFold = false;
+        if (cached && freshness.size > cached.lastSize) {
+            this.logger.debug({ sessionId, lastOffset: cached.lastOffset, currentSize: freshness.size }, 'Incremental parse (source grew)');
+            const incOptions = { byteOffset: cached.lastOffset, includeToolCalls: true };
+            const result = threadRef
+                ? await adapter.parseIncremental(ref.filePath, incOptions, threadRef)
+                : await adapter.parseIncremental(ref.filePath, incOptions);
             const newMessages = result.entries;
             if (adapter.incrementalMode === 'snapshot') {
                 const snapshotMetrics = result.metrics ?? cached.session.metrics;
@@ -86,7 +90,9 @@ let SessionCacheService = SessionCacheService_1 = class SessionCacheService {
                 };
             }
             else {
-                const mergedMessages = [...cached.session.messages, ...newMessages];
+                const folded = this.foldLeadingContinuationIntoCachedTail(cached.session.messages, newMessages);
+                boundaryFold = folded.tailMutatedWithoutNewMessage;
+                const mergedMessages = folded.merged;
                 const mergedMetrics = result.metrics
                     ? this.mergeMetrics(cached.session.metrics, result.metrics, mergedMessages)
                     : cached.session.metrics;
@@ -101,26 +107,35 @@ let SessionCacheService = SessionCacheService_1 = class SessionCacheService {
             lastOffset = result.nextByteOffset;
         }
         else {
-            if (cached && fileStat.size < cached.lastSize) {
-                this.logger.debug({ sessionId }, 'Full reparse (file truncated)');
+            if (cached && freshness.size < cached.lastSize) {
+                this.logger.debug({ sessionId }, 'Full reparse (source truncated)');
             }
-            session = await adapter.parseFullSession(filePath);
-            lastOffset = fileStat.size;
+            session = threadRef
+                ? await adapter.parseFullSession(ref.filePath, threadRef)
+                : await adapter.parseFullSession(ref.filePath);
+            lastOffset = freshness.size;
+        }
+        const coalesced = (0, coalesce_turns_1.coalesceAssistantTurns)(session);
+        if (coalesced.messages !== session.messages) {
+            session = { ...session, messages: coalesced.messages, metrics: coalesced.metrics };
         }
         this.evictIfNeeded(sessionId);
         this.cache.delete(sessionId);
         this.cache.set(sessionId, {
             session,
             lastOffset,
-            lastSize: fileStat.size,
-            lastMtime: fileStat.mtimeMs,
+            lastSize: freshness.size,
+            lastMtime: freshness.mtimeMs,
+            sourceVersion: freshness.sourceVersion,
+            freshnessToken: freshness.token,
             cachedAt: now,
+            boundaryFold,
         });
         return session;
     }
-    async getOrParseWithMeta(sessionId, filePath, adapter) {
+    async getOrParseWithMeta(sessionId, source, adapter) {
         const prevSession = this.cache.get(sessionId)?.session;
-        const session = await this.getOrParse(sessionId, filePath, adapter);
+        const session = await this.getOrParse(sessionId, source, adapter);
         const entry = this.cache.get(sessionId);
         return {
             session,
@@ -128,6 +143,8 @@ let SessionCacheService = SessionCacheService_1 = class SessionCacheService {
             lastOffset: entry.lastOffset,
             lastSize: entry.lastSize,
             lastMtime: entry.lastMtime,
+            sourceVersion: entry.sourceVersion,
+            boundaryFold: entry.boundaryFold,
         };
     }
     getEntry(sessionId) {
@@ -154,6 +171,47 @@ let SessionCacheService = SessionCacheService_1 = class SessionCacheService {
             }
         }
     }
+    foldLeadingContinuationIntoCachedTail(cachedMessages, newMessages) {
+        const tail = cachedMessages[cachedMessages.length - 1];
+        if (!tail || tail.role !== 'assistant' || newMessages.length === 0) {
+            return { merged: [...cachedMessages, ...newMessages], tailMutatedWithoutNewMessage: false };
+        }
+        let foldCount = 0;
+        let tailStopReason = tail.stopReason ?? null;
+        while (foldCount < newMessages.length) {
+            const m = newMessages[foldCount];
+            if (m.isSidechain !== tail.isSidechain)
+                break;
+            if (m.isCompactSummary)
+                break;
+            const isToolResult = (0, tool_result_fold_1.isToolResultOnlyMessage)(m);
+            const isContinuationAssistant = m.role === 'assistant';
+            if (!isToolResult && !isContinuationAssistant)
+                break;
+            if (isContinuationAssistant && tailStopReason === 'end_turn')
+                break;
+            if (isContinuationAssistant)
+                tailStopReason = m.stopReason ?? null;
+            foldCount += 1;
+        }
+        if (foldCount === 0) {
+            return { merged: [...cachedMessages, ...newMessages], tailMutatedWithoutNewMessage: false };
+        }
+        const foldedTail = {
+            ...tail,
+            content: [...tail.content],
+            toolCalls: [...tail.toolCalls],
+            toolResults: [...tail.toolResults],
+        };
+        for (let i = 0; i < foldCount; i += 1) {
+            (0, coalesce_turns_1.foldTurnParts)(foldedTail, newMessages[i]);
+        }
+        const remaining = newMessages.slice(foldCount);
+        return {
+            merged: [...cachedMessages.slice(0, -1), foldedTail, ...remaining],
+            tailMutatedWithoutNewMessage: remaining.length === 0,
+        };
+    }
     mergeMetrics(existing, incremental, allMessages) {
         const inputTokens = existing.inputTokens + incremental.inputTokens;
         const outputTokens = existing.outputTokens + incremental.outputTokens;
@@ -210,6 +268,33 @@ let SessionCacheService = SessionCacheService_1 = class SessionCacheService {
         const stat = await fs.stat(filePath);
         return { size: stat.size, mtimeMs: stat.mtime.getTime() };
     }
+    toSourceRef(source, adapter) {
+        if (typeof source === 'string') {
+            return {
+                filePath: source,
+                providerName: adapter.providerName,
+                kind: adapter.sourceKind ?? 'file',
+            };
+        }
+        return source;
+    }
+    async computeFreshness(ref, adapter) {
+        const { size, mtimeMs } = await this.statFile(ref.filePath);
+        const token = adapter.getFreshnessToken
+            ? await adapter.getFreshnessToken(ref)
+            : { mtimeMs, size };
+        const sourceVersion = ref.kind === 'db' ? this.dbSourceVersion(token, size) : size;
+        return { token, sourceVersion, size, mtimeMs };
+    }
+    dbSourceVersion(token, fallbackSize) {
+        if (token && typeof token === 'object') {
+            const t = token;
+            if (typeof t.maxUpdated === 'number' && Number.isFinite(t.maxUpdated)) {
+                return t.maxUpdated;
+            }
+        }
+        return fallbackSize;
+    }
 };
 exports.SessionCacheService = SessionCacheService;
 exports.SessionCacheService = SessionCacheService = SessionCacheService_1 = __decorate([