@geminixiang/mikan 1.0.0-beta.8 → 1.0.0-beta.80

package/dist/sessions/{agent-memory-file-manager.js → chat-history-sync.js}

@@ -1,32 +1,34 @@
-import { join } from "path";
-import { isRecord, parseJsonValue, readTextFileIfExists } from "../utils/file-guards.js";
-import { formatLocalTimestamp } from "../utils/date.js";
-import { atomicWritePrivateFile } from "../utils/fs-atomic.js";
+import { CONTROL_INPUT_CUSTOM_TYPE } from "./types.js";
+import { OFFICE_LOG_FILENAME, officeSessionsDir } from "../office/index.js";
+import { SessionStore } from "./session-store.js";
+import { join } from "node:path";
 import * as log from "../log.js";
-import { isPlatformHistorySession } from "./metadata.js";
-import { createManagedSessionFile, createManagedSessionFileAtPath, extractSessionSuffix, getChannelSessionDir, getThreadSessionFile, openManagedSession, resolveChannelSessionFile, tryResolveCurrentSession, tryResolveThreadSession, } from "./store.js";
+import { parseJsonValue, readTextFileIfExists } from "../file-guards.js";
+import { formatHistoryLine, stripHistoryLinePrefix } from "./history-line.js";
+import { isPlatformHistorySession } from "./store.js";
+import { isThreadSessionKey } from "./session-key.js";
+import { archiveManagedSessionFile, createManagedSessionFile, createManagedSessionFileAtPath, extractSessionSuffix, getThreadSessionFile, openManagedSession, resolveChannelSessionFile, resolveParentSessionForThread, tryResolveCurrentSession, tryResolveThreadSession, } from "./store.js";
 const DEFAULT_RECENT_DAYS = 14;
 const DEFAULT_MAX_TOP_LEVEL_MESSAGES = 200;
 const CHAT_SYNC_CUSTOM_TYPE = "mikan.chat_sync";
-const BIWEEKLY_ROTATION_ANCHOR = new Date(2026, 0, 4); // Sunday
-const BIWEEKLY_MS = 14 * 24 * 60 * 60 * 1000;
+import { errorMessage, isRecord } from "../unknown-values.js";
 export function hasMaterializedChatSession(options) {
-    if (!options.sessionKey.includes(":")) {
+    if (!isThreadSessionKey(options.sessionKey)) {
         return resolveChannelSessionFile(options.conversationDir) !== null;
     }
     return (tryResolveThreadSession(getThreadSessionFile(options.conversationDir, options.sessionKey)) !==
         null);
 }
 export function registerThreadSession(options) {
-    if (!options.sessionKey.includes(":"))
+    if (!isThreadSessionKey(options.sessionKey))
         return null;
     const threadFile = getThreadSessionFile(options.conversationDir, options.sessionKey);
     return (tryResolveThreadSession(threadFile) ??
-        createManagedSessionFileAtPath(threadFile, options.cwd ?? options.conversationDir));
+        createManagedSessionFileAtPath(threadFile, options.cwd ?? options.conversationDir, resolveParentSessionForThread(options.conversationDir, extractSessionSuffix(options.sessionKey)) ?? undefined));
 }
 export async function waitForThreadSessionBootstrap(options) {
     const { parentSessionKey, sessionKey, hasThreadSession, isParentRunning, sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)), pollMs = 100, } = options;
-    if (!sessionKey.includes(":"))
+    if (!isThreadSessionKey(sessionKey))
         return false;
     if (sessionKey === parentSessionKey)
         return false;
@@ -39,22 +41,22 @@ export async function waitForThreadSessionBootstrap(options) {
     }
     return waited;
 }
-export class AgentMemoryFileManager {
-    constructor(options = {}) {
+export class ChatHistorySync {
+    constructor(options) {
+        this.isCommandText = options.isCommandText;
         this.recentDays = options.recentDays ?? DEFAULT_RECENT_DAYS;
         this.maxTopLevelMessages = options.maxTopLevelMessages ?? DEFAULT_MAX_TOP_LEVEL_MESSAGES;
         this.now = options.now ?? (() => new Date());
     }
     async resolveSessionScope(options) {
         const cwd = options.cwd ?? options.conversationDir;
-        const sessionDir = getChannelSessionDir(options.conversationDir);
-        if (!options.sessionKey.includes(":")) {
-            const contextFile = this.resolveTopLevelSessionFile({
+        const sessionDir = officeSessionsDir(options.conversationDir);
+        if (!isThreadSessionKey(options.sessionKey)) {
+            const contextFile = await this.resolveTopLevelSessionFile({
                 conversationDir: options.conversationDir,
                 sessionDir,
                 cwd,
                 currentMessageId: options.currentMessageId,
-                rotateTopLevelSession: options.rotateTopLevelSession === true,
             });
             return { sessionDir, contextFile, threadRootMessage: null };
         }
@@ -66,152 +68,126 @@ export class AgentMemoryFileManager {
             currentMessageId: options.currentMessageId,
         });
     }
-    syncSessionManager(options) {
+    async syncSessionManager(options) {
         const records = readConversationLog(options.conversationDir);
-        syncSessionManagerFromLog(options.sessionManager, selectExistingSessionSyncMessages(records, {
-            sessionKey: options.sessionKey.includes(":") ? options.sessionKey : null,
+        return syncSessionManagerFromLog(options.sessionManager, selectExistingSessionSyncMessages(records, {
+            sessionKey: isThreadSessionKey(options.sessionKey) ? options.sessionKey : null,
             excludeMessageId: options.currentMessageId,
-        }), this.historyWindow());
+            isCommandText: this.isCommandText,
+        }), {
+            recentDays: this.recentDays,
+            maxMessages: this.maxTopLevelMessages,
+            now: this.now(),
+        });
     }
-    resetSession(options) {
+    async resetSession(options) {
         const cwd = options.cwd ?? options.conversationDir;
-        if (options.sessionKey.includes(":")) {
-            return createManagedSessionFileAtPath(getThreadSessionFile(options.conversationDir, options.sessionKey), cwd);
+        const sessionFile = isThreadSessionKey(options.sessionKey)
+            ? resetThreadSessionFile(options.conversationDir, options.sessionKey, cwd)
+            : createManagedSessionFile(officeSessionsDir(options.conversationDir), cwd);
+        const records = readConversationLog(options.conversationDir);
+        const lastMessageId = latestSyncMessageId(records, {
+            sessionKey: isThreadSessionKey(options.sessionKey) ? options.sessionKey : null,
+            isCommandText: this.isCommandText,
+        });
+        const sessionManager = await openManagedSession(sessionFile, cwd);
+        try {
+            await sessionManager.appendCustomEntry(CHAT_SYNC_CUSTOM_TYPE, {
+                source: OFFICE_LOG_FILENAME,
+                messageCount: 0,
+                resetAt: this.now().toISOString(),
+                lastMessageId: lastMessageId ? lastMessageId : undefined,
+            });
         }
-        return createManagedSessionFile(getChannelSessionDir(options.conversationDir), cwd);
+        finally {
+            await sessionManager.close();
+        }
+        return sessionFile;
     }
-    resolveTopLevelSessionFile(options) {
-        const records = readConversationLog(options.conversationDir);
+    async resolveTopLevelSessionFile(options) {
         const existing = tryResolveCurrentSession(options.sessionDir);
-        if (existing && !isPlatformHistorySession(existing)) {
-            if (!options.rotateTopLevelSession || !shouldRotateTopLevelSession(existing, this.now())) {
-                syncSessionFromLog(existing, options.cwd, selectExistingSessionSyncMessages(records, {
-                    sessionKey: null,
-                    excludeMessageId: options.currentMessageId,
-                }), this.historyWindow());
-                return existing;
-            }
-        }
+        if (existing && !isPlatformHistorySession(existing))
+            return existing;
+        const records = readConversationLog(options.conversationDir);
         const sessionFile = createManagedSessionFile(options.sessionDir, options.cwd);
         const bootstrapRecords = selectRecentTopLevelMessages(records, {
             recentDays: this.recentDays,
             maxMessages: this.maxTopLevelMessages,
             now: this.now(),
             excludeMessageId: options.currentMessageId,
+            isCommandText: this.isCommandText,
         });
-        bootstrapSessionFromLog(sessionFile, options.cwd, bootstrapRecords, latestSyncMessageId(records, {
+        await bootstrapSessionFromLog(sessionFile, options.cwd, bootstrapRecords, latestSyncMessageId(records, {
             sessionKey: null,
             excludeMessageId: options.currentMessageId,
+            isCommandText: this.isCommandText,
         }));
         return sessionFile;
     }
-    historyWindow() {
-        return { recentDays: this.recentDays, maxMessages: this.maxTopLevelMessages, now: this.now() };
-    }
-    resolveThreadSessionScope(options) {
+    async resolveThreadSessionScope(options) {
         const threadFile = getThreadSessionFile(options.conversationDir, options.sessionKey);
         const threadId = extractSessionSuffix(options.sessionKey);
         const records = readConversationLog(options.conversationDir);
         const threadRootMessage = buildThreadRootSeed(findLogRecordById(records, threadId)?.message);
         const existing = tryResolveThreadSession(threadFile);
         if (existing) {
-            syncSessionFromLog(existing, options.cwd, selectExistingSessionSyncMessages(records, {
-                sessionKey: options.sessionKey,
-                excludeMessageId: options.currentMessageId,
-            }), this.historyWindow());
             return { sessionDir: options.sessionDir, contextFile: existing, threadRootMessage };
         }
-        createManagedSessionFileAtPath(threadFile, options.cwd);
+        createManagedSessionFileAtPath(threadFile, options.cwd, resolveParentSessionForThread(options.conversationDir, threadId) ?? undefined);
         const bootstrapRecords = selectThreadBootstrapMessages(records, threadId, {
             recentDays: this.recentDays,
             maxTopLevelMessages: this.maxTopLevelMessages,
             now: this.now(),
             excludeMessageId: options.currentMessageId,
+            isCommandText: this.isCommandText,
         });
-        bootstrapSessionFromLog(threadFile, options.cwd, bootstrapRecords, latestSyncMessageId(records, {
+        await bootstrapSessionFromLog(threadFile, options.cwd, bootstrapRecords, latestSyncMessageId(records, {
             sessionKey: options.sessionKey,
             excludeMessageId: options.currentMessageId,
+            isCommandText: this.isCommandText,
         }));
         return { sessionDir: options.sessionDir, contextFile: threadFile, threadRootMessage };
     }
 }
-function shouldRotateTopLevelSession(sessionFile, now) {
-    const timestamp = readSessionTimestamp(sessionFile);
-    return timestamp !== null && biweeklyBucket(timestamp) !== biweeklyBucket(now);
-}
-function readSessionTimestamp(sessionFile) {
-    const raw = readTextFileIfExists(sessionFile);
-    if (raw === undefined)
-        return null;
-    const firstLine = raw.split("\n").find((line) => line.trim());
-    if (!firstLine)
-        return null;
+function existingThreadParent(threadFile) {
+    let header;
     try {
-        const header = parseJsonValue(firstLine, (value) => isRecord(value), (detail) => (detail === "unexpected JSON shape" ? "expected a JSON object" : detail));
-        if (typeof header.timestamp !== "string")
-            return null;
-        const date = new Date(header.timestamp);
-        return Number.isFinite(date.getTime()) ? date : null;
+        header = SessionStore.readHeader(threadFile);
     }
     catch {
-        return null;
+        return undefined;
     }
+    const path = header?.parentSession;
+    if (!header || !path)
+        return undefined;
+    const id = header.parentSessionId ?? readParentSessionId(path);
+    return id ? { path, id } : undefined;
 }
-function biweeklyBucket(date) {
-    const weekStart = sundayStart(date).getTime();
-    const anchor = sundayStart(BIWEEKLY_ROTATION_ANCHOR).getTime();
-    return Math.floor((weekStart - anchor) / BIWEEKLY_MS);
-}
-function sundayStart(date) {
-    return new Date(date.getFullYear(), date.getMonth(), date.getDate() - date.getDay());
-}
-function readConversationLog(conversationDir) {
-    const logFile = join(conversationDir, "log.jsonl");
-    const raw = readTextFileIfExists(logFile);
-    if (raw === undefined)
-        return [];
-    const lines = raw.trim().split("\n").filter(Boolean);
-    const records = [];
-    for (let i = 0; i < lines.length; i++) {
-        try {
-            const message = parseJsonValue(lines[i], (value) => isRecord(value), (detail) => (detail === "unexpected JSON shape" ? "expected a JSON object" : detail));
-            records.push({ message, index: i });
-        }
-        catch (err) {
-            log.logWarning(`Skipping malformed log entry at ${logFile}:${i + 1}`, err instanceof Error ? err.message : String(err));
-        }
+function readParentSessionId(parentPath) {
+    try {
+        return SessionStore.readHeader(parentPath)?.id;
     }
-    return coalesceMessagingBotLogChunks(records);
-}
-function coalesceMessagingBotLogChunks(records) {
-    const coalesced = [];
-    for (const record of records) {
-        const previous = coalesced.at(-1);
-        if (previous && canCoalesceMessagingBotLogChunk(previous.message, record.message)) {
-            previous.message.text = `${previous.message.text ?? ""}${record.message.text ?? ""}`;
-            continue;
-        }
-        coalesced.push({ ...record, message: { ...record.message } });
+    catch {
+        return undefined;
     }
-    return coalesced;
 }
-function canCoalesceMessagingBotLogChunk(previous, current) {
-    return (previous.isMessagingBot === true &&
-        current.isMessagingBot === true &&
-        !!previous.ts &&
-        previous.ts === current.ts &&
-        previous.threadTs === current.threadTs &&
-        previous.user === current.user);
+function resetThreadSessionFile(conversationDir, sessionKey, cwd) {
+    const threadFile = getThreadSessionFile(conversationDir, sessionKey);
+    const parent = existingThreadParent(threadFile) ??
+        resolveParentSessionForThread(conversationDir, extractSessionSuffix(sessionKey)) ??
+        undefined;
+    archiveManagedSessionFile(threadFile);
+    return createManagedSessionFileAtPath(threadFile, cwd, parent);
 }
 function findLogRecordById(records, messageId) {
     for (let i = records.length - 1; i >= 0; i--) {
-        if (records[i].message.ts === messageId)
+        if (records[i]?.message.ts === messageId)
             return records[i];
     }
     return undefined;
 }
 function selectRecentTopLevelMessages(records, options) {
-    return selectRecentMessages(records.filter((record) => isTopLevelHistoryMessage(record.message, options.excludeMessageId)), options);
+    return selectRecentMessages(recordsBeforeCurrentMessage(records, options.excludeMessageId).filter((record) => isTopLevelHistoryMessage(record.message, options)), options);
 }
 function selectRecentMessages(records, options) {
     const sinceMs = options.now.getTime() - options.recentDays * 24 * 60 * 60 * 1000;
@@ -220,22 +196,24 @@ function selectRecentMessages(records, options) {
         .slice(-options.maxMessages);
 }
 function selectThreadBootstrapMessages(records, threadId, options) {
-    const rootRecord = findLogRecordById(records, threadId);
+    const scopedRecords = recordsBeforeCurrentMessage(records, options.excludeMessageId);
+    const rootRecord = findLogRecordById(scopedRecords, threadId);
     const topLevelSource = rootRecord
-        ? records.filter((record) => record.index <= rootRecord.index)
-        : records;
+        ? scopedRecords.filter((record) => record.index <= rootRecord.index)
+        : scopedRecords;
     const topLevelRecords = selectRecentTopLevelMessages(topLevelSource, {
         recentDays: options.recentDays,
         maxMessages: options.maxTopLevelMessages,
         now: options.now,
         excludeMessageId: options.excludeMessageId,
+        isCommandText: options.isCommandText,
     });
-    const threadRecords = records.filter((record) => isRenderableConversationMessage(record.message, options.excludeMessageId) &&
+    const threadRecords = scopedRecords.filter((record) => isRenderableConversationMessage(record.message, options) &&
         (record.message.ts === threadId || record.message.threadTs === threadId));
     return dedupeAndSortRecords([...topLevelRecords, ...threadRecords]);
 }
-function isTopLevelHistoryMessage(message, excludeMessageId) {
-    if (!isRenderableConversationMessage(message, excludeMessageId))
+function isTopLevelHistoryMessage(message, filter) {
+    if (!isRenderableConversationMessage(message, filter))
         return false;
     return !message.threadTs;
 }
@@ -247,29 +225,32 @@ function isRecentHistoryMessage(message, sinceMs) {
 }
 function selectExistingSessionSyncMessages(records, options) {
     const threadId = options.sessionKey ? extractSessionSuffix(options.sessionKey) : null;
-    return dedupeAndSortRecords(records.filter((record) => {
-        if (!isRenderableConversationMessage(record.message, options.excludeMessageId))
+    return dedupeAndSortRecords(recordsBeforeCurrentMessage(records, options.excludeMessageId).filter((record) => {
+        if (!isRenderableConversationMessage(record.message, options))
             return false;
         if (!threadId)
             return !record.message.threadTs;
         return record.message.ts === threadId || record.message.threadTs === threadId;
     }));
 }
+function recordsBeforeCurrentMessage(records, currentMessageId) {
+    if (!currentMessageId)
+        return records;
+    const currentRecord = findLogRecordById(records, currentMessageId);
+    if (!currentRecord)
+        return records;
+    return records.filter((record) => record.index < currentRecord.index);
+}
 function latestSyncMessageId(records, options) {
     return selectExistingSessionSyncMessages(records, options).at(-1)?.message.ts;
 }
-function isRenderableConversationMessage(message, excludeMessageId) {
-    if (excludeMessageId && message.ts === excludeMessageId)
+function isRenderableConversationMessage(message, filter) {
+    if (filter.excludeMessageId && message.ts === filter.excludeMessageId)
         return false;
-    if (isChatCommandMessage(message))
+    if (!message.isMessagingBot && filter.isCommandText(message.text ?? ""))
         return false;
     return !!message.text?.trim();
 }
-function isChatCommandMessage(message) {
-    const text = message.text?.trim() ?? "";
-    return (!message.isMessagingBot &&
-        /^\/(?:pi-[\w-]+|login|session|new|stop|model|sandbox|admin|auto-reply)(?:@\w+)?(?:\s|$)/i.test(text));
-}
 function dedupeAndSortRecords(records) {
     const byKey = new Map();
     for (const record of records) {
@@ -296,74 +277,95 @@ function sortTime(record) {
     }
     return record.index;
 }
-function bootstrapSessionFromLog(sessionFile, cwd, records, lastMessageId = records.at(-1)?.message.ts) {
+async function bootstrapSessionFromLog(sessionFile, cwd, records, lastMessageId = records.at(-1)?.message.ts) {
     if (records.length === 0 && !lastMessageId)
         return;
-    const sessionManager = openManagedSession(sessionFile, cwd);
-    appendLogRecordsToSession(sessionManager, records);
-    sessionManager.appendCustomEntry(CHAT_SYNC_CUSTOM_TYPE, {
-        source: "log.jsonl",
-        messageCount: records.length,
-        lastMessageId,
-    });
-    forceRewriteSession(sessionManager, sessionFile);
-}
-function syncSessionFromLog(sessionFile, cwd, records, historyWindow) {
-    if (records.length === 0)
-        return;
-    syncSessionManagerFromLog(openManagedSession(sessionFile, cwd), records, historyWindow);
+    const sessionManager = await openManagedSession(sessionFile, cwd);
+    try {
+        await appendLogRecordsToSession(sessionManager, records);
+        await sessionManager.appendCustomEntry(CHAT_SYNC_CUSTOM_TYPE, {
+            source: OFFICE_LOG_FILENAME,
+            messageCount: records.length,
+            lastMessageId,
+        });
+    }
+    finally {
+        await sessionManager.close();
+    }
 }
-function syncSessionManagerFromLog(sessionManager, records, historyWindow) {
+async function syncSessionManagerFromLog(sessionManager, records, historyWindow) {
     if (records.length === 0)
-        return;
-    const existingEntries = sessionManager.getEntries();
+        return { appended: 0 };
+    const existingEntries = await sessionManager.getEntries();
+    const resetAt = getLatestChatSyncResetAt(existingEntries);
+    const controlledIds = new Set(existingEntries.flatMap((entry) => {
+        if (entry.type !== "custom" ||
+            entry.customType !== CONTROL_INPUT_CUSTOM_TYPE ||
+            !isRecord(entry.data))
+            return [];
+        return typeof entry.data.messageId === "string" ? [entry.data.messageId] : [];
+    }));
+    const eligibleRecords = records.filter((record) => !controlledIds.has(record.message.ts ?? "") && (!resetAt || isAfterReset(record, resetAt)));
     const lastSyncedMessageId = getLatestChatSyncMessageId(existingEntries);
     const lastSyncedIndex = lastSyncedMessageId
-        ? records.findIndex((record) => record.message.ts === lastSyncedMessageId)
+        ? eligibleRecords.findIndex((record) => record.message.ts === lastSyncedMessageId)
         : -1;
-    if (lastSyncedMessageId && lastSyncedIndex === -1)
-        return;
-    const syncCandidates = selectRecentMessages(records.slice(lastSyncedIndex + 1), historyWindow);
+    const syncCandidates = selectRecentMessages(eligibleRecords.slice(lastSyncedIndex + 1), historyWindow);
     if (syncCandidates.length === 0)
-        return;
+        return { appended: 0 };
     const represented = buildRepresentedMessageCounts(existingEntries);
     const newRecords = syncCandidates.filter((record) => !consumeRepresentedLogMessage(record, represented));
     if (newRecords.length === 0)
-        return;
-    appendLogRecordsToSession(sessionManager, newRecords);
-    sessionManager.appendCustomEntry(CHAT_SYNC_CUSTOM_TYPE, {
-        source: "log.jsonl",
+        return { appended: 0 };
+    const lastMessageId = syncCandidates.at(-1)?.message.ts;
+    await appendLogRecordsToSession(sessionManager, newRecords);
+    await sessionManager.appendCustomEntry(CHAT_SYNC_CUSTOM_TYPE, {
+        source: OFFICE_LOG_FILENAME,
         messageCount: newRecords.length,
-        lastMessageId: syncCandidates.at(-1)?.message.ts,
+        lastMessageId,
     });
+    return {
+        appended: newRecords.length,
+        lastMessageId,
+    };
 }
-function appendLogRecordsToSession(sessionManager, records) {
+async function appendLogRecordsToSession(sessionManager, records) {
     for (const record of records) {
         const message = buildHistorySessionMessage(record.message);
         if (message)
-            sessionManager.appendMessage(message);
+            await sessionManager.appendMessage(message);
     }
 }
-function forceRewriteSession(sessionManager, sessionFile) {
-    const header = sessionManager.getHeader();
-    if (!header)
-        return;
-    const content = [header, ...sessionManager.getEntries()]
-        .map((entry) => JSON.stringify(entry))
-        .join("\n");
-    atomicWritePrivateFile(sessionFile, `${content}\n`);
-}
-function getLatestChatSyncMessageId(entries) {
-    for (let i = entries.length - 1; i >= 0; i--) {
-        const entry = entries[i];
-        if (entry.type !== "custom" || entry.customType !== CHAT_SYNC_CUSTOM_TYPE)
-            continue;
-        if (!isRecord(entry.data))
-            return undefined;
-        return typeof entry.data.lastMessageId === "string" ? entry.data.lastMessageId : undefined;
+function isChatSyncMarker(entry) {
+    return entry.type === "custom" && entry.customType === CHAT_SYNC_CUSTOM_TYPE;
+}
+function markerResetAt(entry) {
+    if (!isChatSyncMarker(entry))
+        return undefined;
+    if (!isRecord(entry.data) || typeof entry.data.resetAt !== "string")
+        return undefined;
+    const resetAt = new Date(entry.data.resetAt).getTime();
+    return Number.isFinite(resetAt) ? resetAt : undefined;
+}
+function getLatestChatSyncResetAt(entries) {
+    for (const entry of entries.toReversed()) {
+        const resetAt = markerResetAt(entry);
+        if (resetAt !== undefined)
+            return resetAt;
     }
     return undefined;
 }
+function isAfterReset(record, resetAt) {
+    if (!record.message.date)
+        return false;
+    const messageTime = new Date(record.message.date).getTime();
+    return Number.isFinite(messageTime) && messageTime >= resetAt;
+}
+function getLatestChatSyncMessageId(entries) {
+    const marker = entries.toReversed().find(isChatSyncMarker);
+    const lastMessageId = isRecord(marker?.data) ? marker.data.lastMessageId : undefined;
+    return typeof lastMessageId === "string" ? lastMessageId : undefined;
+}
 function buildRepresentedMessageCounts(entries) {
     const counts = new Map();
     for (const entry of entries) {
@@ -413,11 +415,7 @@ function getSessionMessageText(entry) {
         .map((part) => (part.type === "text" && "text" in part ? part.text : ""))
         .join("\n");
 }
-function normalizeComparableText(text) {
-    return text
-        .replace(/^\[[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}[+-][0-9]{2}:[0-9]{2}\]\s+\[[^\]]+\](?:\s+\[in-thread:[^\]]+\])?:\s*/, "")
-        .trim();
-}
+const normalizeComparableText = stripHistoryLinePrefix;
 function buildHistorySessionMessage(message) {
     const text = message.text?.trim();
     if (!text)
@@ -427,7 +425,7 @@ function buildHistorySessionMessage(message) {
         return {
             role: "user",
             content: [{ type: "text", text: formatHistoryMessage(message) }],
-            ...(timestamp !== undefined ? { timestamp } : {}),
+            timestamp,
         };
     }
     return {
@@ -438,7 +436,7 @@ function buildHistorySessionMessage(message) {
         model: "platform-history",
         usage: zeroUsage(),
         stopReason: "stop",
-        ...(timestamp !== undefined ? { timestamp } : {}),
+        timestamp,
     };
 }
 function buildThreadRootSeed(message) {
@@ -466,10 +464,11 @@ function parseMessageTimestamp(message) {
     return undefined;
 }
 function formatHistoryMessage(message) {
-    const text = message.text?.trim() ?? "";
-    const userLabel = message.userName || message.user || "unknown";
-    const timestamp = message.date ? formatLocalTimestamp(new Date(message.date)) : null;
-    return timestamp ? `[${timestamp}] [${userLabel}]: ${text}` : `[${userLabel}]: ${text}`;
+    return formatHistoryLine({
+        date: message.date ? new Date(message.date) : undefined,
+        userName: message.userName || message.user,
+        text: message.text?.trim() ?? "",
+    });
 }
 function zeroUsage() {
     return {
@@ -481,4 +480,46 @@ function zeroUsage() {
         cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
     };
 }
-//# sourceMappingURL=agent-memory-file-manager.js.map
+function readConversationLog(conversationDir) {
+    const logFile = join(conversationDir, OFFICE_LOG_FILENAME);
+    const raw = readTextFileIfExists(logFile);
+    if (raw === undefined)
+        return [];
+    const records = [];
+    for (const [index, line] of raw.trim().split("\n").filter(Boolean).entries()) {
+        const message = parseLogLine(line, logFile, index + 1);
+        if (message)
+            records.push({ message, index });
+    }
+    return coalesceMessagingBotLogChunks(records);
+}
+function parseLogLine(line, logFile, lineNumber) {
+    try {
+        return parseJsonValue(line, (value) => isRecord(value), (detail, kind) => (kind === "shape" ? "expected a JSON object" : detail));
+    }
+    catch (err) {
+        log.logWarning(`Skipping malformed log entry at ${logFile}:${lineNumber}`, errorMessage(err));
+        return undefined;
+    }
+}
+function coalesceMessagingBotLogChunks(records) {
+    const coalesced = [];
+    for (const record of records) {
+        const previous = coalesced.at(-1);
+        if (previous && canCoalesceMessagingBotLogChunk(previous.message, record.message)) {
+            previous.message.text = `${previous.message.text ?? ""}${record.message.text ?? ""}`;
+            continue;
+        }
+        coalesced.push({ ...record, message: { ...record.message } });
+    }
+    return coalesced;
+}
+function canCoalesceMessagingBotLogChunk(previous, current) {
+    return (previous.isMessagingBot === true &&
+        current.isMessagingBot === true &&
+        !!previous.ts &&
+        previous.ts === current.ts &&
+        previous.threadTs === current.threadTs &&
+        previous.user === current.user);
+}
+//# sourceMappingURL=chat-history-sync.js.map